Skip to content

Commit 99fe199

Browse files
committed
1.21.9 version, :)
1 parent 1147c36 commit 99fe199

12 files changed

Lines changed: 29 additions & 40 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: build
2-
on: [push, pull_request]
2+
on: [push]
33

44
jobs:
55
build:

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
// see https://fabricmc.net/develop/ for new versions
3-
id 'fabric-loom' version '1.10-SNAPSHOT' apply false
3+
id 'fabric-loom' version '1.11-SNAPSHOT' apply false
44
// see https://projects.neoforged.net/neoforged/moddevgradle for new versions
5-
id 'net.neoforged.moddev' version '2.0.97' apply false
5+
id 'net.neoforged.moddev' version '2.0.107' apply false
66

77
}

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

Lines changed: 0 additions & 15 deletions
This file was deleted.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.lukasabbe.bookshelfinspector.mixin;
22

3-
import com.lukasabbe.bookshelfinspector.Constants;
43
import com.lukasabbe.bookshelfinspector.renderer.Inspector;
54
import net.minecraft.client.Minecraft;
65
import net.minecraft.client.player.LocalPlayer;

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
import com.lukasabbe.bookshelfinspector.BookshelfInspectorClient;
44
import com.lukasabbe.bookshelfinspector.data.BookData;
55
import com.lukasabbe.bookshelfinspector.data.Tags;
6-
import com.lukasabbe.bookshelfinspector.mixin.BookshelfInvoker;
76
import com.lukasabbe.bookshelfinspector.network.packets.BookShelfInventoryRequestPayload;
87
import com.lukasabbe.bookshelfinspector.network.packets.LecternInventoryRequestPayload;
98
import com.lukasabbe.bookshelfinspector.platform.Services;
109
import net.minecraft.client.Minecraft;
1110
import net.minecraft.core.BlockPos;
12-
import net.minecraft.world.level.block.Blocks;
1311
import net.minecraft.world.level.block.ChiseledBookShelfBlock;
1412
import net.minecraft.world.level.block.state.BlockState;
1513
import net.minecraft.world.phys.BlockHitResult;
@@ -23,9 +21,9 @@ public class Inspector {
2321
public void inspect(Minecraft client){
2422
if(!modAvailable) return;
2523

26-
if(client.cameraEntity == null || client.player == null) return;
24+
if(client.getCameraEntity() == null || client.player == null) return;
2725

28-
HitResult hit = client.cameraEntity.pick(5f,0f,false);
26+
HitResult hit = client.getCameraEntity().pick(5f,0f,false);
2927

3028
//find block hit, if not found block returns
3129
final HitResult.Type type = hit.getType();
@@ -81,7 +79,7 @@ private void bookShelfInspect(BlockPos pos, BlockHitResult blockHitResult, Minec
8179

8280
//Gets index position for a book in the bookshelf
8381
ChiseledBookShelfBlock bookshelfBlock = (ChiseledBookShelfBlock) blockState.getBlock();
84-
OptionalInt optionalInt = ((BookshelfInvoker)bookshelfBlock).invokerGetSlotForHitPos(blockHitResult,blockState);
82+
OptionalInt optionalInt = bookshelfBlock.getHitSlot(blockHitResult, blockState.getValue(ChiseledBookShelfBlock.FACING));
8583

8684
//if the position is empty, return
8785
if(optionalInt.isEmpty()) {

common/src/main/resources/bookshelfinspector.mixins.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
],
99
"client": [
1010
"BookshelfMixin",
11-
"InGameHudMixin",
12-
"BookshelfInvoker"
11+
"InGameHudMixin"
1312
],
1413
"server": [],
1514
"injectors": {

fabric/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies {
1717
modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
1818

1919
modApi "me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config}"
20-
modApi "com.terraformersmc:modmenu:${project.mod_menu}"
20+
//modApi "com.terraformersmc:modmenu:${project.mod_menu}"
2121

2222
include(implementation "org.yaml:snakeyaml:${project.YAML_snake}")
2323
}

fabric/src/main/java/com/lukasabbe/bookshelfinspector/ModMenu.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/*
12
package com.lukasabbe.bookshelfinspector;
23
34
import com.terraformersmc.modmenu.api.ConfigScreenFactory;
@@ -40,3 +41,4 @@ public ConfigScreenFactory<?> getModConfigScreenFactory() {
4041
};
4142
}
4243
}
44+
*/

fabric/src/main/resources/fabric.mod.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
],
2121
"client": [
2222
"com.lukasabbe.bookshelfinspector.BookshelfInspectorFabricClient"
23-
],
24-
"modmenu": [
25-
"com.lukasabbe.bookshelfinspector.ModMenu"
2623
]
2724
},
2825
"mixins": [
@@ -31,7 +28,7 @@
3128
"depends": {
3229
"fabricloader": ">=${fabric_loader_version}",
3330
"fabric-api": "*",
34-
"minecraft": "~${minecraft_version}",
31+
"minecraft": "~1.21.9-beta.1",
3532
"java": ">=${java_version}"
3633
}
3734
}

gradle.properties

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
version=2.1+1.21.8
1+
version=2.1+1.21.9-pre1
22
group=com.lukasabbe.bookshelfinspector
33
java_version=21
44

55
# Common
6-
minecraft_version=1.21.8
6+
minecraft_version=1.21.9-pre1
77
mod_name=BookshelfInspector
88
mod_author=Lukasabbe
99
mod_id=bookshelfinspector
@@ -12,17 +12,18 @@ credits=
1212
description=Inspect any book in a chiseled bookshelf.
1313
minecraft_version_range=[1.21.8, 1.22)
1414

15-
neo_form_version=1.21.8-20250717.133445
15+
# https://projects.neoforged.net/neoforged/neoform
16+
neo_form_version=1.21.9-pre1-20250916.160523
1617
# The version of ParchmentMC that is used, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions
1718
parchment_minecraft=1.21.8
1819
parchment_version=2025.07.20
1920

2021
# Fabric
21-
fabric_version=0.132.0+1.21.8
22+
fabric_version=0.133.7+1.21.9
2223
fabric_loader_version=0.17.2
2324

2425
# NeoForge
25-
neoforge_version=21.8.39
26+
neoforge_version=21.8.47
2627
neoforge_loader_version_range=[4,)
2728

2829
# Gradle
@@ -32,4 +33,4 @@ org.gradle.daemon=false
3233
# Global dep
3334
YAML_snake=2.4
3435
cloth_config=19.0.147
35-
mod_menu=15.0.0-beta.3
36+
mod_menu=15.0.0

0 commit comments

Comments
 (0)