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

Use Redirect instead of Inject to avoid allocations

Browse Source
This commit is contained in:
embeddedt 2023-07-28 16:38:44 -04:00
parent 4fe3b93fb0
commit 451b26fa93
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reduce_blockstate_cache_rebuilds/BlockStateBaseMixin.java
View File

@ -1,6 +1,7 @@
package org.embeddedt.modernfix.common.mixin.perf.reduce_blockstate_cache_rebuilds; package org.embeddedt.modernfix.common.mixin.perf.reduce_blockstate_cache_rebuilds;
import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.material.FluidState;
import org.embeddedt.modernfix.duck.IBlockState; import org.embeddedt.modernfix.duck.IBlockState;
import org.objectweb.asm.Opcodes; import org.objectweb.asm.Opcodes;
import org.spongepowered.asm.mixin.Dynamic; import org.spongepowered.asm.mixin.Dynamic;
@ -17,6 +18,8 @@ public abstract class BlockStateBaseMixin implements IBlockState {
@Shadow public abstract void initCache(); @Shadow public abstract void initCache();
@Shadow private BlockBehaviour.BlockStateBase.Cache cache; @Shadow private BlockBehaviour.BlockStateBase.Cache cache;
@Shadow private FluidState fluidState;
@Shadow private boolean isRandomlyTicking;
private volatile boolean cacheInvalid = false; private volatile boolean cacheInvalid = false;
private static boolean buildingCache = false; private static boolean buildingCache = false;
@ -62,9 +65,26 @@ public abstract class BlockStateBaseMixin implements IBlockState {
return generateCache(base); return generateCache(base);
} }
@Inject(method = { "getFluidState", "isRandomlyTicking" }, at = @At("HEAD")) @Redirect(method = "*", at = @At(
private void generateCacheFluidStateTicking(CallbackInfoReturnable<?> cir) { value = "FIELD",
generateCache((BlockBehaviour.BlockStateBase)(Object)this); opcode = Opcodes.GETFIELD,
target = "Lnet/minecraft/world/level/block/state/BlockBehaviour$BlockStateBase;fluidState:Lnet/minecraft/world/level/material/FluidState;",
ordinal = 0
))
private FluidState genCacheBeforeGettingFluid(BlockBehaviour.BlockStateBase base) {
generateCache(base);
return this.fluidState;
}
@Redirect(method = "*", at = @At(
value = "FIELD",
opcode = Opcodes.GETFIELD,
target = "Lnet/minecraft/world/level/block/state/BlockBehaviour$BlockStateBase;isRandomlyTicking:Z",
ordinal = 0
))
private boolean genCacheBeforeGettingTicking(BlockBehaviour.BlockStateBase base) {
generateCache(base);
return this.isRandomlyTicking;
} }
@Dynamic @Dynamic