Merge pull request #26 from lukasabbe/1.21.9

1.21.10

Author: lukasabbe

.github/workflows/build.yml

@@ -1,5 +1,5 @@
 name: build
-on: [push, pull_request]
+on: [push]
 
 jobs:
   build:

build.gradle

@@ -1,7 +1,6 @@
 plugins {
     // see https://fabricmc.net/develop/ for new versions
-    id 'fabric-loom' version '1.10-SNAPSHOT' apply false
+    id 'fabric-loom' version '1.11-SNAPSHOT' apply false
     // see https://projects.neoforged.net/neoforged/moddevgradle for new versions
-    id 'net.neoforged.moddev' version '2.0.97' apply false
-
+    id 'net.neoforged.moddev' version '2.0.112' apply false
 }

common/src/main/java/com/lukasabbe/bookshelfinspector/config/Config.java

@@ -19,7 +19,7 @@ public class Config {
 
     public void loadConfig(){
         Path configPath = Services.PLATFORM.getConfigPath("bookshelfinspector-config.yml");
-        if(!Files.exists(configPath))createConfig(configPath);
+        if(!Files.exists(configPath)) createConfig(configPath);
         Yaml yaml = new Yaml();
         try{
             Map<String, Object> configMap = yaml.load(new FileReader(configPath.toFile()));
@@ -39,7 +39,8 @@ public void loadConfig(){
     }
 
     private void createConfig(Path configPath){
-        Path defaultConfigPath = Services.PLATFORM.getFileInModContainer("bookshelfinspector", "bookshelfinspector-config.yml");
+        Path defaultConfigPath = Services.PLATFORM.getFileOrCopyInModContainer("bookshelfinspector", "bookshelfinspector-config.yml");
+        if(defaultConfigPath == null) return;
         try {
             Files.copy(defaultConfigPath, configPath);
         } catch (IOException e) {

common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/BookshelfInvoker.java

@@ -1,6 +1,5 @@
 package com.lukasabbe.bookshelfinspector.mixin;
 
-import com.lukasabbe.bookshelfinspector.Constants;
 import com.lukasabbe.bookshelfinspector.renderer.Inspector;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.LocalPlayer;

common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/BookshelfMixin.java

@@ -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/mixin/InGameHudMixin.java

@@ -7,14 +7,7 @@ public interface IPlatformHelper {
 
     boolean isModLoaded(String modId);
 
-    boolean isDevelopmentEnvironment();
-
     Path getConfigPath(String file);
 
-    Path getFileInModContainer(String mod, String fileName);
-
-    default String getEnvironmentName() {
-
-        return isDevelopmentEnvironment() ? "development" : "production";
-    }
+    Path getFileOrCopyInModContainer(String mod, String fileName);
 }

common/src/main/java/com/lukasabbe/bookshelfinspector/platform/services/IPlatformHelper.java

@@ -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;

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

@@ -3,13 +3,11 @@
 import com.lukasabbe.bookshelfinspector.BookshelfInspectorClient;
 import com.lukasabbe.bookshelfinspector.data.BookData;
 import com.lukasabbe.bookshelfinspector.data.Tags;
-import com.lukasabbe.bookshelfinspector.mixin.BookshelfInvoker;
 import com.lukasabbe.bookshelfinspector.network.packets.BookShelfInventoryRequestPayload;
 import com.lukasabbe.bookshelfinspector.network.packets.LecternInventoryRequestPayload;
 import com.lukasabbe.bookshelfinspector.platform.Services;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.ChiseledBookShelfBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
@@ -23,9 +21,9 @@ public class Inspector {
     public void inspect(Minecraft client){
         if(!modAvailable) return;
 
-        if(client.cameraEntity == null || client.player == null) return;
+        if(client.getCameraEntity() == null || client.player == null) return;
 
-        HitResult hit = client.cameraEntity.pick(5f,0f,false);
+        HitResult hit = client.getCameraEntity().pick(5f,0f,false);
 
         //find block hit, if not found block returns
         final HitResult.Type type = hit.getType();
@@ -81,7 +79,7 @@ private void bookShelfInspect(BlockPos pos, BlockHitResult blockHitResult, Minec
 
         //Gets index position for a book in the bookshelf
         ChiseledBookShelfBlock bookshelfBlock = (ChiseledBookShelfBlock) blockState.getBlock();
-        OptionalInt optionalInt = ((BookshelfInvoker)bookshelfBlock).invokerGetSlotForHitPos(blockHitResult,blockState);
+        OptionalInt optionalInt = bookshelfBlock.getHitSlot(blockHitResult, blockState.getValue(ChiseledBookShelfBlock.FACING));
 
         //if the position is empty, return
         if(optionalInt.isEmpty()) {

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

@@ -8,8 +8,7 @@
   ],
   "client": [
     "BookshelfMixin",
-    "InGameHudMixin",
-    "BookshelfInvoker"
+    "InGameHudMixin"
   ],
   "server": [],
   "injectors": {