Skip to content

Commit 34bc295

Browse files
Phoenix-Starlightembeddedt
authored andcommitted
Mark some more mixins as ClientOnlyMixin
1 parent 456bca4 commit 34bc295

File tree

5 files changed

+10
-0
lines changed

5 files changed

+10
-0
lines changed

common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/disable_unihex_font/UnihexProviderDefinitionMixin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import net.minecraft.client.gui.font.providers.UnihexProvider;
88
import net.minecraft.server.packs.resources.ResourceManager;
99
import org.embeddedt.modernfix.ModernFix;
10+
import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
1011
import org.spongepowered.asm.mixin.Mixin;
1112
import org.spongepowered.asm.mixin.injection.At;
1213
import org.spongepowered.asm.mixin.injection.Inject;
@@ -16,6 +17,7 @@
1617
import java.lang.reflect.Constructor;
1718

1819
@Mixin(UnihexProvider.Definition.class)
20+
@ClientOnlyMixin
1921
public class UnihexProviderDefinitionMixin {
2022
@Inject(method = "unpack", at = @At("HEAD"), cancellable = true)
2123
private void disableProvider(CallbackInfoReturnable<Either<GlyphProviderDefinition.Loader, GlyphProviderDefinition.Reference>> cir) {

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelManagerMixin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import net.minecraft.world.level.block.state.BlockState;
1212
import net.minecraft.world.level.block.state.StateDefinition;
1313
import org.embeddedt.modernfix.ModernFix;
14+
import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
1415
import org.embeddedt.modernfix.util.LambdaMap;
1516
import org.spongepowered.asm.mixin.Mixin;
1617
import org.spongepowered.asm.mixin.injection.At;
@@ -26,6 +27,7 @@
2627
import java.util.stream.Collectors;
2728

2829
@Mixin(ModelManager.class)
30+
@ClientOnlyMixin
2931
public class ModelManagerMixin {
3032
@Redirect(method = "reload", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/resources/model/ModelManager;loadBlockModels(Lnet/minecraft/server/packs/resources/ResourceManager;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"))
3133
private CompletableFuture<Map<ResourceLocation, BlockModel>> deferBlockModelLoad(ResourceManager manager, Executor executor) {

fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/core/ClientCommonPacketListenerImplMixin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22

33
import net.minecraft.client.multiplayer.ClientCommonPacketListenerImpl;
44
import org.embeddedt.modernfix.ModernFixClientFabric;
5+
import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
56
import org.spongepowered.asm.mixin.Mixin;
67
import org.spongepowered.asm.mixin.injection.At;
78
import org.spongepowered.asm.mixin.injection.Inject;
89
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
910

1011
@Mixin(ClientCommonPacketListenerImpl.class)
12+
@ClientOnlyMixin
1113
public class ClientCommonPacketListenerImplMixin {
1214
@Inject(method = "handleUpdateTags", at = @At("RETURN"))
1315
private void signalTags(CallbackInfo ci) {

fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakerImplMixin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import net.minecraft.world.level.block.state.BlockState;
1212
import org.embeddedt.modernfix.ModernFix;
1313
import org.embeddedt.modernfix.ModernFixClient;
14+
import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
1415
import org.embeddedt.modernfix.api.entrypoint.ModernFixClientIntegration;
1516
import org.embeddedt.modernfix.duck.IExtendedModelBaker;
1617
import org.embeddedt.modernfix.duck.IExtendedModelBakery;
@@ -29,6 +30,7 @@
2930
import java.util.function.Function;
3031

3132
@Mixin(value = ModelBakery.ModelBakerImpl.class, priority = 600)
33+
@ClientOnlyMixin
3234
public abstract class ModelBakerImplMixin implements IExtendedModelBaker {
3335
private static final boolean debugDynamicModelLoading = Boolean.getBoolean("modernfix.debugDynamicModelLoading");
3436
@Shadow @Final private ModelBakery field_40571;

neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ModelBakerImplMixin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import net.minecraft.resources.ResourceLocation;
99
import org.embeddedt.modernfix.ModernFix;
1010
import org.embeddedt.modernfix.ModernFixClient;
11+
import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
1112
import org.embeddedt.modernfix.api.entrypoint.ModernFixClientIntegration;
1213
import org.embeddedt.modernfix.duck.IExtendedModelBaker;
1314
import org.embeddedt.modernfix.duck.IExtendedModelBakery;
@@ -23,6 +24,7 @@
2324
import java.util.function.Function;
2425

2526
@Mixin(value = ModelBakery.ModelBakerImpl.class, priority = 600)
27+
@ClientOnlyMixin
2628
public abstract class ModelBakerImplMixin implements IModelBakerImpl, IExtendedModelBaker {
2729
private static final boolean debugDynamicModelLoading = Boolean.getBoolean("modernfix.debugDynamicModelLoading");
2830
@Shadow @Final private ModelBakery field_40571;

0 commit comments

Comments
 (0)