diff --git a/build.gradle b/build.gradle index 1e1f771..24be595 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,8 @@ dependencies { Set apiMudules = [ "fabric-api-base", "fabric-networking-api-v1", - "fabric-lifecycle-events-v1" + "fabric-lifecycle-events-v1", + "fabric-resource-loader-v0" ] apiMudules.forEach { diff --git a/gradle.properties b/gradle.properties index bada694..5b38978 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ minecraft_version=1.21 yarn_mappings=1.21+build.9 loader_version=0.16.5 # Mod Properties -mod_version=1.2+1.21 +mod_version=1.3+1.21 maven_group=me.lukasabbe archives_base_name=Bookshelfinspector diff --git a/src/main/java/me/lukasabbe/bookshelfinspector/BookshelfinspectorClient.java b/src/main/java/me/lukasabbe/bookshelfinspector/BookshelfinspectorClient.java index 02f8065..d721475 100644 --- a/src/main/java/me/lukasabbe/bookshelfinspector/BookshelfinspectorClient.java +++ b/src/main/java/me/lukasabbe/bookshelfinspector/BookshelfinspectorClient.java @@ -10,6 +10,7 @@ import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; import net.minecraft.item.Items; +import net.minecraft.text.Text; @Environment(EnvType.CLIENT) public class BookshelfinspectorClient implements ClientModInitializer { diff --git a/src/main/java/me/lukasabbe/bookshelfinspector/mixin/InGameHudMixin.java b/src/main/java/me/lukasabbe/bookshelfinspector/mixin/InGameHudMixin.java index 39d25a4..2786248 100644 --- a/src/main/java/me/lukasabbe/bookshelfinspector/mixin/InGameHudMixin.java +++ b/src/main/java/me/lukasabbe/bookshelfinspector/mixin/InGameHudMixin.java @@ -1,6 +1,9 @@ package me.lukasabbe.bookshelfinspector.mixin; +import com.mojang.blaze3d.systems.RenderSystem; import me.lukasabbe.bookshelfinspector.util.HudRenderer; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.hud.InGameHud; @@ -12,13 +15,15 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +@Environment(EnvType.CLIENT) @Mixin(InGameHud.class) - public class InGameHudMixin { @Shadow @Final private MinecraftClient client; @Inject(method = "render",at=@At("RETURN")) public void render(DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci){ + RenderSystem.enableBlend(); HudRenderer.hudRender(context, client); + RenderSystem.disableBlend(); } } diff --git a/src/main/java/me/lukasabbe/bookshelfinspector/util/HudRenderer.java b/src/main/java/me/lukasabbe/bookshelfinspector/util/HudRenderer.java index bc4b730..8369e3d 100644 --- a/src/main/java/me/lukasabbe/bookshelfinspector/util/HudRenderer.java +++ b/src/main/java/me/lukasabbe/bookshelfinspector/util/HudRenderer.java @@ -2,6 +2,8 @@ package me.lukasabbe.bookshelfinspector.util; import me.lukasabbe.bookshelfinspector.BookshelfinspectorClient; import me.lukasabbe.bookshelfinspector.data.BookData; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.component.DataComponentTypes; @@ -10,6 +12,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.text.Text; +@Environment(EnvType.CLIENT) public class HudRenderer { public static void hudRender(DrawContext context, MinecraftClient client){ if(!BookshelfinspectorClient.modAvailable) return; @@ -41,7 +44,7 @@ public class HudRenderer { var writtenBookContentComponent = itemStack.getComponents().get(DataComponentTypes.WRITTEN_BOOK_CONTENT); if(writtenBookContentComponent != null){ - context.drawCenteredTextWithShadow(client.textRenderer, Text.translatableWithFallback("bookshelfinspector.text.book","by ").append(writtenBookContentComponent.author()), x,y+20, 0xFFFFFFFF); + context.drawCenteredTextWithShadow(client.textRenderer, Text.translatable("key.bookshelfinspector.author_text",writtenBookContentComponent.author()), x,y+20, 0xFFFFFFFF); } } diff --git a/src/main/resources/assets/bookshelfinspector/lang/en_us.json b/src/main/resources/assets/bookshelfinspector/lang/en_us.json index bc636d2..de82f15 100644 --- a/src/main/resources/assets/bookshelfinspector/lang/en_us.json +++ b/src/main/resources/assets/bookshelfinspector/lang/en_us.json @@ -1,3 +1,3 @@ { - "bookshelfinspector.text.book" : "by " + "key.bookshelfinspector.author_text" : "by %d" } \ No newline at end of file diff --git a/src/main/resources/assets/bookshelfinspector/lang/sv_se.json b/src/main/resources/assets/bookshelfinspector/lang/sv_se.json index 94f40fb..62eb69e 100644 --- a/src/main/resources/assets/bookshelfinspector/lang/sv_se.json +++ b/src/main/resources/assets/bookshelfinspector/lang/sv_se.json @@ -1,3 +1,3 @@ { - "bookshelfinspector.text.book" : "av " + "key.bookshelfinspector.author_text" : "av %d" } \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index ba371ed..9e9105d 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -25,6 +25,7 @@ "minecraft": ">=${minecraft_version}", "fabric-api-base": "*", "fabric-networking-api-v1": "*", - "fabric-lifecycle-events-v1": "*" + "fabric-lifecycle-events-v1": "*", + "fabric-resource-loader-v0": "*" } }