Lukas/bookshelf-inspector
1
0
Fork 0
mirror of https://github.com/lukasabbe/bookshelf-inspector.git synced 2026-04-30 10:40:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

small refactors in code base

Browse Source
This commit is contained in:
lukasabbe
2025-09-27 11:57:19 +02:00
parent 58e6d2f800
commit 30cdae2013
13 changed files with 31 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/InGameHudMixin.java
-1
View File
@@ -1,6 +1,5 @@
package com.lukasabbe.bookshelfinspector.mixin;
import com.lukasabbe.bookshelfinspector.Constants;
import com.lukasabbe.bookshelfinspector.renderer.HudRenderer;
import net.minecraft.client.DeltaTracker;
import net.minecraft.client.Minecraft;
common/src/main/java/com/lukasabbe/bookshelfinspector/renderer/HudRenderer.java
-2
View File
@@ -1,10 +1,8 @@
package com.lukasabbe.bookshelfinspector.renderer;
import com.lukasabbe.bookshelfinspector.BookshelfInspectorClient;
import com.lukasabbe.bookshelfinspector.Constants;
import com.lukasabbe.bookshelfinspector.data.BookData;
import com.lukasabbe.bookshelfinspector.util.RomanNumerals;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Font;
fabric/src/main/java/com/lukasabbe/bookshelfinspector/ModMenu.java → fabric/src/main/java/com/lukasabbe/bookshelfinspector/config/ModMenu.java
View File
gradle.properties
+1 -1
View File
@@ -19,7 +19,7 @@ parchment_minecraft=1.21.8
parchment_version=2025.07.20
# Fabric
fabric_version=0.133.12+1.21.9
fabric_version=0.133.13+1.21.9
fabric_loader_version=0.17.2
# NeoForge
neoforge/build.gradle
+2
View File
@@ -49,3 +49,5 @@ dependencies {
}
sourceSets.main.resources { srcDir 'src/generated/resources' }
sourceSets.main.resources { srcDir 'src/generated/resources' }
neoforge/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorNeoForge.java
+2 -1
View File
@@ -1,11 +1,12 @@
package com.lukasabbe.bookshelfinspector;
import com.lukasabbe.bookshelfinspector.util.EventHandler;
import com.lukasabbe.bookshelfinspector.util.NetworkHandler;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.fml.common.Mod;
@Mod(value = Constants.MOD_ID)
public class BookshelfInspectorNeoForge {
public BookshelfInspectorNeoForge(IEventBus eventBus) {
EventHandler.initServer();
eventBus.addListener(NetworkHandler::registerPayloads);
neoforge/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorNeoForgeClient.java
+2
View File
@@ -1,5 +1,7 @@
package com.lukasabbe.bookshelfinspector;
import com.lukasabbe.bookshelfinspector.config.ClothConfigGenerator;
import com.lukasabbe.bookshelfinspector.util.EventHandler;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.fml.ModLoadingContext;
neoforge/src/main/java/com/lukasabbe/bookshelfinspector/ClothConfigGenerator.java → neoforge/src/main/java/com/lukasabbe/bookshelfinspector/config/ClothConfigGenerator.java
+2 -1
View File
@@ -1,5 +1,6 @@
package com.lukasabbe.bookshelfinspector;
package com.lukasabbe.bookshelfinspector.config;
import com.lukasabbe.bookshelfinspector.BookshelfInspectorClient;
import me.shedaniel.clothconfig2.api.ConfigBuilder;
import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
import net.minecraft.client.gui.screens.Screen;
neoforge/src/main/java/com/lukasabbe/bookshelfinspector/platform/NeoForgeEventHelper.java
+2 -4
View File
@@ -1,6 +1,6 @@
package com.lukasabbe.bookshelfinspector.platform;
import com.lukasabbe.bookshelfinspector.EventHandler;
import com.lukasabbe.bookshelfinspector.util.EventHandler;
import com.lukasabbe.bookshelfinspector.platform.handlers.OnPlayerDisconnectEvent;
import com.lukasabbe.bookshelfinspector.platform.handlers.OnPlayerJoinEvent;
import com.lukasabbe.bookshelfinspector.platform.services.IEventHelper;
@@ -12,7 +12,5 @@ public class NeoForgeEventHelper implements IEventHelper {
}
@Override
public void registerOnPlayerDisconnect(OnPlayerDisconnectEvent event) {
EventHandler.playerDisconnectEvents.add(event);
}
public void registerOnPlayerDisconnect(OnPlayerDisconnectEvent event) { EventHandler.playerDisconnectEvents.add(event); }
}
neoforge/src/main/java/com/lukasabbe/bookshelfinspector/EventHandler.java → neoforge/src/main/java/com/lukasabbe/bookshelfinspector/util/EventHandler.java
+2 -4
View File
@@ -1,4 +1,4 @@
package com.lukasabbe.bookshelfinspector;
package com.lukasabbe.bookshelfinspector.util;
import com.lukasabbe.bookshelfinspector.platform.handlers.OnPlayerDisconnectEvent;
import com.lukasabbe.bookshelfinspector.platform.handlers.OnPlayerJoinEvent;
@@ -17,9 +17,7 @@ public class EventHandler {
public static void initClient(){
NeoForge.EVENT_BUS.addListener(EventHandler::onDisconnect);
}
public static void initServer(){
NeoForge.EVENT_BUS.addListener(EventHandler::onJoin);
}
public static void initServer(){ NeoForge.EVENT_BUS.addListener(EventHandler::onJoin); }
private static void onJoin(PlayerEvent.PlayerLoggedInEvent event){
playerJoinEvents.forEach(onPlayerJoinEvent -> onPlayerJoinEvent.onPlayerJoin((ServerPlayer) event.getEntity(),event.getEntity().getServer()));
neoforge/src/main/java/com/lukasabbe/bookshelfinspector/NetworkHandler.java → neoforge/src/main/java/com/lukasabbe/bookshelfinspector/util/NetworkHandler.java
+4 -3
View File
@@ -1,5 +1,7 @@
package com.lukasabbe.bookshelfinspector;
package com.lukasabbe.bookshelfinspector.util;
import com.lukasabbe.bookshelfinspector.BookshelfInspector;
import com.lukasabbe.bookshelfinspector.Constants;
import com.lukasabbe.bookshelfinspector.network.packets.BookShelfInventoryPayload;
import com.lukasabbe.bookshelfinspector.network.packets.BookShelfInventoryRequestPayload;
import com.lukasabbe.bookshelfinspector.network.packets.LecternInventoryRequestPayload;
@@ -7,7 +9,6 @@ import com.lukasabbe.bookshelfinspector.network.packets.ModCheckPayload;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.server.level.ServerPlayer;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.neoforge.network.event.RegisterConfigurationTasksEvent;
import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
import net.neoforged.neoforge.network.registration.PayloadRegistrar;
@@ -15,7 +16,7 @@ public class NetworkHandler {
@SubscribeEvent
public static void registerPayloads(final RegisterPayloadHandlersEvent event){
final PayloadRegistrar registrar = event.registrar("bookshelfinspector").optional();
final PayloadRegistrar registrar = event.registrar(Constants.MOD_ID).optional();
registrar.playToClient(
BookShelfInventoryPayload.ID,
BookShelfInventoryPayload.CODEC,
neoforge/src/main/resources/META-INF/neoforge.mods.toml
+12
View File
@@ -11,3 +11,15 @@ authors = "${mod_author}" #optional
description = '''${description}''' #mandatory (Supports multiline text)
[[mixins]]
config = "${mod_id}.mixins.json"
[[dependencies.${mod_id}]] #optional
modId = "neoforge" #mandatory
type = "required" #mandatory (Can be one of "required", "optional", "incompatible" or "discouraged")
versionRange = "[${neoforge_version},)" #mandatory
ordering = "NONE" # The order that this dependency should load in relation to your mod, required to be either 'BEFORE' or 'AFTER' if the dependency is not mandatory
side = "BOTH" # Side this dependency is applied on - 'BOTH', 'CLIENT' or 'SERVER'
[[dependencies.${mod_id}]]
modId = "minecraft"
type="required" #mandatory (Can be one of "required", "optional", "incompatible" or "discouraged")
versionRange = "${minecraft_version_range}"
ordering = "NONE"
side = "BOTH"
settings.gradle
-17
View File
@@ -8,21 +8,6 @@ pluginManagement {
url = uri('https://maven.fabricmc.net')
}
/*
exclusiveContent {
forRepository {
maven {
name = 'Fabric'
url = uri('https://maven.fabricmc.net')
}
}
filter {
includeGroup('net.fabricmc')
includeGroup('fabric-loom')
}
}*/
exclusiveContent {
forRepository {
maven {
@@ -57,5 +42,3 @@ rootProject.name = 'BookshelfInspectorMultiloader'
include('common')
include('fabric')
include('neoforge')
// include 'spigot'