diff --git a/src/main/java/turniplabs/halplibe/mixin/MinecraftMixin.java b/src/main/java/turniplabs/halplibe/mixin/MinecraftMixin.java index 86e5fa4..68225a4 100644 --- a/src/main/java/turniplabs/halplibe/mixin/MinecraftMixin.java +++ b/src/main/java/turniplabs/halplibe/mixin/MinecraftMixin.java @@ -42,12 +42,12 @@ public void afterGameStartEntrypoint(CallbackInfo ci){ } @Inject(method = "startGame", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/block/Blocks;init()V", shift = At.Shift.AFTER)) - public void afterBlockInitEntrypoint(CallbackInfo callbackInfo) { + public void afterBlockInitEntrypoint(CallbackInfo ci) { FabricLoader.getInstance().getEntrypoints("afterBlockInit", BlockInitEntrypoint.class).forEach(BlockInitEntrypoint::afterBlockInit);; } @Inject(method = "startGame", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/item/Items;init()V", shift = At.Shift.AFTER)) - public void afterItemInitEntrypoint(CallbackInfo callbackInfo) { + public void afterItemInitEntrypoint(CallbackInfo ci) { FabricLoader.getInstance().getEntrypoints("afterItemInit", ItemInitEntrypoint.class).forEach(ItemInitEntrypoint::afterItemInit);; } diff --git a/src/main/java/turniplabs/halplibe/mixin/MinecraftServerMixin.java b/src/main/java/turniplabs/halplibe/mixin/MinecraftServerMixin.java index 52ec383..ce9de99 100644 --- a/src/main/java/turniplabs/halplibe/mixin/MinecraftServerMixin.java +++ b/src/main/java/turniplabs/halplibe/mixin/MinecraftServerMixin.java @@ -9,7 +9,9 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import turniplabs.halplibe.helper.network.NetworkHandler; +import turniplabs.halplibe.util.BlockInitEntrypoint; import turniplabs.halplibe.util.GameStartEntrypoint; +import turniplabs.halplibe.util.ItemInitEntrypoint; import turniplabs.halplibe.util.RecipeEntrypoint; @Mixin(value = MinecraftServer.class, remap = false) @@ -34,6 +36,16 @@ public void afterGameStartEntrypoint(CallbackInfoReturnable cir){ FabricLoader.getInstance().getEntrypoints("afterGameStart", GameStartEntrypoint.class).forEach(GameStartEntrypoint::afterGameStart); } + @Inject(method = "startServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/block/Blocks;init()V", shift = At.Shift.AFTER)) + public void afterBlockInitEntrypoint(CallbackInfoReturnable cir) { + FabricLoader.getInstance().getEntrypoints("afterBlockInit", BlockInitEntrypoint.class).forEach(BlockInitEntrypoint::afterBlockInit);; + } + + @Inject(method = "startServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/item/Items;init()V", shift = At.Shift.AFTER)) + public void afterItemInitEntrypoint(CallbackInfoReturnable cir) { + FabricLoader.getInstance().getEntrypoints("afterItemInit", ItemInitEntrypoint.class).forEach(ItemInitEntrypoint::afterItemInit);; + } + /* * @author sunsetsatellite * @reason begone log4j (this fixes logging not existing on a modded server at the cost of no gui) diff --git a/src/main/resources/halplibe.mixins.json b/src/main/resources/halplibe.mixins.json index 3d576d9..3a1b026 100644 --- a/src/main/resources/halplibe.mixins.json +++ b/src/main/resources/halplibe.mixins.json @@ -5,27 +5,27 @@ "compatibilityLevel": "JAVA_8", "mixins": [ "I18nMixin", - "MinecraftMixin", - "MinecraftServerMixin", "MobCreeperMixin", "accessors.BlockAccessor", "accessors.BlocksAccessor", - "accessors.EntityFireflyFXAccessor", - "accessors.EntityFXAccessor", "accessors.LanguageAccessor", "accessors.WeightedRandomBagAccessor", "accessors.WeightedRandomBagEntryAccessor", "accessors.PacketHandlerServerAccessor" ], "client": [ + "MinecraftMixin", "PacketHandlerClientMixin", "models.BlockColorDispatcherMixin", "models.BlockModelDispatcherMixin", "models.EntityRenderDispatcherMixin", "models.ItemModelDispatcherMixin", - "models.TileEntityRendererDispatcherMixin" + "models.TileEntityRendererDispatcherMixin", + "accessors.EntityFireflyFXAccessor", + "accessors.EntityFXAccessor" ], "server": [ + "MinecraftServerMixin", "PacketHandlerLoginMixin" ], "injectors": {