Skip to content

Mixin warning and New Entrypoint Fix #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 21, 2025
Merged

Mixin warning and New Entrypoint Fix #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/turniplabs/halplibe/mixin/MinecraftMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);;
}

Expand Down
12 changes: 12 additions & 0 deletions src/main/java/turniplabs/halplibe/mixin/MinecraftServerMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -34,6 +36,16 @@ public void afterGameStartEntrypoint(CallbackInfoReturnable<Boolean> 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<Boolean> 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<Boolean> 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)
Expand Down
10 changes: 5 additions & 5 deletions src/main/resources/halplibe.mixins.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Loading