Merge pull request #24 from lukasabbe/fix/SecurityCraft

Added support for securitycraft bookshelfs and lecterns

common/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspector.java

@@ -20,5 +20,4 @@ public class BookshelfInspector {
             Services.NETWORK_HELPER.sendPacketFromServer(player, new ModCheckPayload(true));
         });
     }
-
 }

common/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorClient.java

@@ -18,6 +18,5 @@ public class BookshelfInspectorClient {
             modAvailable = false;
             bookShelfData = new BookShelfData();
         });
-
     }
 }

common/src/main/java/com/lukasabbe/bookshelfinspector/Constants.java

@@ -9,7 +9,6 @@ public class Constants {
 	public static final String MOD_NAME = "Bookshelf Inspector";
 	public static final Logger LOG = LoggerFactory.getLogger(MOD_NAME);
 
-	//Packets
 	public static final ResourceLocation BOOK_SHELF_INVENTORY_REQUEST_PACKET_ID = ResourceLocation.fromNamespaceAndPath(MOD_ID,"book_shelf_inventory_request");
 	public static final ResourceLocation BOOK_SHELF_INVENTORY_PACKET_ID = ResourceLocation.fromNamespaceAndPath(MOD_ID,"book_shelf_inventory");
 	public static final ResourceLocation MOD_CHECK_PACKET_ID = ResourceLocation.fromNamespaceAndPath(MOD_ID,"mod_check");

common/src/main/java/com/lukasabbe/bookshelfinspector/data/Tags.java

@@ -7,4 +7,5 @@ import net.minecraft.world.level.block.Block;
 
 public class Tags {
     public static final TagKey<Block> CHISELED_BOOKSHELVES = TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath("c", "chiseled_bookshelves"));
+    public static final TagKey<Block> LECTERNS = TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath("c", "lectern"));
 }

common/src/main/java/com/lukasabbe/bookshelfinspector/network/server/BookShelfInventoryRequestServerPayloadHandler.java

@@ -5,7 +5,7 @@ import com.lukasabbe.bookshelfinspector.network.packets.BookShelfInventoryPayloa
 import com.lukasabbe.bookshelfinspector.network.packets.BookShelfInventoryRequestPayload;
 import com.lukasabbe.bookshelfinspector.platform.Services;
 import com.lukasabbe.bookshelfinspector.platform.handlers.ServerPayloadHandler;
-import com.lukasabbe.bookshelfinspector.util.BookshelfTools;
+import com.lukasabbe.bookshelfinspector.util.BlockTools;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
@@ -15,11 +15,13 @@ public class BookShelfInventoryRequestServerPayloadHandler implements ServerPayl
     public void receive(BookShelfInventoryRequestPayload bookShelfInventoryRequestPayload, ServerPlayer player) {
         if(BookshelfInspector.serverInstance == null) return;
 
-        ItemStack stack = BookshelfTools.getItemById(bookShelfInventoryRequestPayload.pos(),bookShelfInventoryRequestPayload.slotNum(), player);
+        ItemStack stack = BlockTools.getBookInChiseledBookShelf(bookShelfInventoryRequestPayload.pos(),bookShelfInventoryRequestPayload.slotNum(), player.level());
+
         if(stack == null){
             Services.NETWORK_HELPER.sendPacketFromServer(player, new BookShelfInventoryPayload(Items.AIR.getDefaultInstance(), bookShelfInventoryRequestPayload.pos(), bookShelfInventoryRequestPayload.slotNum()));
             return;
         }
+
         Services.NETWORK_HELPER.sendPacketFromServer(player, new BookShelfInventoryPayload(stack, bookShelfInventoryRequestPayload.pos(), bookShelfInventoryRequestPayload.slotNum()));
     }
 }

common/src/main/java/com/lukasabbe/bookshelfinspector/network/server/LecternInventoryRequestServerPayloadHandler.java

@@ -5,7 +5,7 @@ import com.lukasabbe.bookshelfinspector.network.packets.BookShelfInventoryPayloa
 import com.lukasabbe.bookshelfinspector.network.packets.LecternInventoryRequestPayload;
 import com.lukasabbe.bookshelfinspector.platform.Services;
 import com.lukasabbe.bookshelfinspector.platform.handlers.ServerPayloadHandler;
-import com.lukasabbe.bookshelfinspector.util.LecternTools;
+import com.lukasabbe.bookshelfinspector.util.BlockTools;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
@@ -15,12 +15,13 @@ public class LecternInventoryRequestServerPayloadHandler implements ServerPayloa
     public void receive(LecternInventoryRequestPayload lecternInventoryRequestPayload, ServerPlayer player) {
         if(BookshelfInspector.serverInstance == null) return;
 
-        ItemStack stack = LecternTools.getItemStack(lecternInventoryRequestPayload.pos(), player);
+        ItemStack stack = BlockTools.getBookInLectern(lecternInventoryRequestPayload.pos(), player.level());
 
         if(stack == null){
             Services.NETWORK_HELPER.sendPacketFromServer(player, new BookShelfInventoryPayload(Items.AIR.getDefaultInstance(), lecternInventoryRequestPayload.pos(), 0));
             return;
         }
+
         Services.NETWORK_HELPER.sendPacketFromServer(player, new BookShelfInventoryPayload(stack, lecternInventoryRequestPayload.pos(), 0));
     }
 }

common/src/main/java/com/lukasabbe/bookshelfinspector/platform/Services.java

@@ -7,22 +7,12 @@ import com.lukasabbe.bookshelfinspector.platform.services.IPlatformHelper;
 
 import java.util.ServiceLoader;
 
-// Service loaders are a built-in Java feature that allow us to locate implementations of an interface that vary from one
-// environment to another. In the context of MultiLoader we use this feature to access a mock API in the common code that
-// is swapped out for the platform specific implementation at runtime.
 public class Services {
 
-    // In this example we provide a platform helper which provides information about what platform the mod is running on.
-    // For example this can be used to check if the code is running on Forge vs Fabric, or to ask the modloader if another
-    // mod is loaded.
     public static final IPlatformHelper PLATFORM = load(IPlatformHelper.class);
     public static final INetworkHelper NETWORK_HELPER = load(INetworkHelper.class);
     public static final IEventHelper EVENTS_HELPER = load(IEventHelper.class);
 
-    // This code is used to load a service for the current environment. Your implementation of the service must be defined
-    // manually by including a text file in META-INF/services named with the fully qualified class name of the service.
-    // Inside the file you should write the fully qualified class name of the implementation to load for the platform. For
-    // example our file on Forge points to ForgePlatformHelper while Fabric points to FabricPlatformHelper.
     public static <T> T load(Class<T> clazz) {
 
         final T loadedService = ServiceLoader.load(clazz)

common/src/main/java/com/lukasabbe/bookshelfinspector/renderer/Inspector.java

@@ -25,7 +25,6 @@ public class Inspector {
 
         if(client.cameraEntity == null || client.player == null) return;
 
-        //Send raycast max 5 blocks
         HitResult hit = client.cameraEntity.pick(5f,0f,false);
 
         //find block hit, if not found block returns
@@ -51,7 +50,7 @@ public class Inspector {
 
         if(client.player.level().getBlockState(pos).is(Tags.CHISELED_BOOKSHELVES)){
             bookShelfInspect(pos, blockHitResult, client);
-        }else if(client.player.level().getBlockState(pos).is(Blocks.LECTERN) && config.lecternToggle){
+        }else if(client.player.level().getBlockState(pos).is(Tags.LECTERNS) && config.lecternToggle){
             lecternInspect(pos);
         }else{
 

common/src/main/java/com/lukasabbe/bookshelfinspector/util/BlockTools.java

@@ -0,0 +1,26 @@
+package com.lukasabbe.bookshelfinspector.util;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.ChiseledBookShelfBlockEntity;
+import net.minecraft.world.level.block.entity.LecternBlockEntity;
+
+public class BlockTools {
+    public static ItemStack getBookInChiseledBookShelf(BlockPos pos, int slotNum, Level world){
+        final BlockEntity blockEntity = world.getBlockEntity(pos);
+        if(blockEntity instanceof ChiseledBookShelfBlockEntity chiseledBookShelf) {
+            final ItemStack stack = chiseledBookShelf.getItem(slotNum);
+            if(stack.isEmpty()) return null;
+            return stack;
+        }
+        return null;
+    }
+
+    public static ItemStack getBookInLectern(BlockPos pos, Level world){
+        final BlockEntity blockEntity = world.getBlockEntity(pos);
+        if(blockEntity instanceof LecternBlockEntity lecternBlockEntity) return lecternBlockEntity.getBook();
+        return null;
+    }
+}

common/src/main/java/com/lukasabbe/bookshelfinspector/util/BookshelfTools.java

@@ -1,28 +0,0 @@
-package com.lukasabbe.bookshelfinspector.util;
-
-import com.lukasabbe.bookshelfinspector.BookshelfInspector;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.entity.ChiseledBookShelfBlockEntity;
-
-import java.util.Optional;
-
-public class BookshelfTools {
-    public static ItemStack getItemById(BlockPos pos, int slotNum, Player player){
-        final Level world = BookshelfInspector.serverInstance.getPlayerList().getPlayer(player.getUUID()).level();
-
-        final Optional<ChiseledBookShelfBlockEntity> blockEntityOptional = world.getBlockEntity(pos, BlockEntityType.CHISELED_BOOKSHELF);
-
-        if(blockEntityOptional.isEmpty()) return null;
-
-        final ChiseledBookShelfBlockEntity blockEntity = blockEntityOptional.get();
-        final ItemStack stack = blockEntity.getItem(slotNum);
-
-        if(stack.isEmpty()) return null;
-
-        return stack;
-    }
-}

common/src/main/java/com/lukasabbe/bookshelfinspector/util/LecternTools.java

@@ -1,24 +0,0 @@
-package com.lukasabbe.bookshelfinspector.util;
-
-import com.lukasabbe.bookshelfinspector.BookshelfInspector;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.entity.LecternBlockEntity;
-
-import java.util.Optional;
-
-public class LecternTools {
-    public static ItemStack getItemStack(BlockPos pos, Player player){
-        final Level world = BookshelfInspector.serverInstance.getPlayerList().getPlayer(player.getUUID()).level();
-
-        Optional<LecternBlockEntity> blockEntityOptional = world.getBlockEntity(pos, BlockEntityType.LECTERN);
-        if(blockEntityOptional.isEmpty()) return null;
-
-        LecternBlockEntity lecternBlock = blockEntityOptional.get();
-
-        return lecternBlock.getBook();
-    }
-}

common/src/main/resources/data/c/tags/block/chiseled_bookshelves.json

@@ -1,6 +1,10 @@
 {
   "replace": false,
   "values": [
-    "minecraft:chiseled_bookshelf"
+    "minecraft:chiseled_bookshelf",
+    {
+      "id": "securitycraft:reinforced_chiseled_bookshelf",
+      "required": false
+    }
   ]
 }

common/src/main/resources/data/c/tags/block/lectern.json

@@ -0,0 +1,10 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:lectern",
+    {
+      "id": "securitycraft:reinforced_lectern",
+      "required": false
+    }
+  ]
+}

gradle.properties

@@ -1,4 +1,4 @@
-version=2.0+1.21.8
+version=2.1+1.21.8
 group=com.lukasabbe.bookshelfinspector
 java_version=21
 

settings.gradle

@@ -49,3 +49,5 @@ rootProject.name = 'BookshelfInspectorMultiloader'
 include('common')
 include('fabric')
 include('neoforge')
+
+include 'spigot'