From 99fe199ad8472cd559230426c3d1b04ad990a292 Mon Sep 17 00:00:00 2001 From: lukasabbe <67807954+lukasabbe@users.noreply.github.com> Date: Wed, 17 Sep 2025 12:02:36 +0200 Subject: [PATCH] 1.21.9 version, :) --- .github/workflows/build.yml | 2 +- build.gradle | 4 ++-- .../mixin/BookshelfInvoker.java | 15 --------------- .../bookshelfinspector/mixin/BookshelfMixin.java | 1 - .../bookshelfinspector/renderer/Inspector.java | 8 +++----- .../main/resources/bookshelfinspector.mixins.json | 3 +-- fabric/build.gradle | 2 +- .../com/lukasabbe/bookshelfinspector/ModMenu.java | 2 ++ fabric/src/main/resources/fabric.mod.json | 5 +---- gradle.properties | 13 +++++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 12 ++++++++++-- 12 files changed, 29 insertions(+), 40 deletions(-) delete mode 100644 common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/BookshelfInvoker.java diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6b9f7ef..4fabca1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,5 @@ name: build -on: [push, pull_request] +on: [push] jobs: build: diff --git a/build.gradle b/build.gradle index a9a76dd..9b6cfaf 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ 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.107' apply false } \ No newline at end of file diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/BookshelfInvoker.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/BookshelfInvoker.java deleted file mode 100644 index 22cb6d8..0000000 --- a/common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/BookshelfInvoker.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.lukasabbe.bookshelfinspector.mixin; - -import net.minecraft.world.level.block.ChiseledBookShelfBlock; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.phys.BlockHitResult; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; - -import java.util.OptionalInt; - -@Mixin(ChiseledBookShelfBlock.class) -public interface BookshelfInvoker { - @Invoker("getHitSlot") - OptionalInt invokerGetSlotForHitPos(BlockHitResult hit, BlockState state); -} diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/BookshelfMixin.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/BookshelfMixin.java index 65b5fcd..15415ea 100644 --- a/common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/BookshelfMixin.java +++ b/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.Inspector; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/renderer/Inspector.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/renderer/Inspector.java index 0156875..e1b85ff 100644 --- a/common/src/main/java/com/lukasabbe/bookshelfinspector/renderer/Inspector.java +++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/renderer/Inspector.java @@ -3,13 +3,11 @@ package com.lukasabbe.bookshelfinspector.renderer; 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 @@ public class Inspector { //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()) { diff --git a/common/src/main/resources/bookshelfinspector.mixins.json b/common/src/main/resources/bookshelfinspector.mixins.json index 5443468..57187a8 100644 --- a/common/src/main/resources/bookshelfinspector.mixins.json +++ b/common/src/main/resources/bookshelfinspector.mixins.json @@ -8,8 +8,7 @@ ], "client": [ "BookshelfMixin", - "InGameHudMixin", - "BookshelfInvoker" + "InGameHudMixin" ], "server": [], "injectors": { diff --git a/fabric/build.gradle b/fabric/build.gradle index 6cad713..faca9c4 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -17,7 +17,7 @@ dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}" modApi "me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config}" - modApi "com.terraformersmc:modmenu:${project.mod_menu}" + //modApi "com.terraformersmc:modmenu:${project.mod_menu}" include(implementation "org.yaml:snakeyaml:${project.YAML_snake}") } diff --git a/fabric/src/main/java/com/lukasabbe/bookshelfinspector/ModMenu.java b/fabric/src/main/java/com/lukasabbe/bookshelfinspector/ModMenu.java index 7238d99..5529637 100644 --- a/fabric/src/main/java/com/lukasabbe/bookshelfinspector/ModMenu.java +++ b/fabric/src/main/java/com/lukasabbe/bookshelfinspector/ModMenu.java @@ -1,3 +1,4 @@ +/* package com.lukasabbe.bookshelfinspector; import com.terraformersmc.modmenu.api.ConfigScreenFactory; @@ -40,3 +41,4 @@ public class ModMenu implements ModMenuApi { }; } } + */ diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index ed78e4f..02de68c 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -20,9 +20,6 @@ ], "client": [ "com.lukasabbe.bookshelfinspector.BookshelfInspectorFabricClient" - ], - "modmenu": [ - "com.lukasabbe.bookshelfinspector.ModMenu" ] }, "mixins": [ @@ -31,7 +28,7 @@ "depends": { "fabricloader": ">=${fabric_loader_version}", "fabric-api": "*", - "minecraft": "~${minecraft_version}", + "minecraft": "~1.21.9-beta.1", "java": ">=${java_version}" } } diff --git a/gradle.properties b/gradle.properties index 5132024..829c407 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ -version=2.1+1.21.8 +version=2.1+1.21.9-pre1 group=com.lukasabbe.bookshelfinspector java_version=21 # Common -minecraft_version=1.21.8 +minecraft_version=1.21.9-pre1 mod_name=BookshelfInspector mod_author=Lukasabbe mod_id=bookshelfinspector @@ -12,17 +12,18 @@ credits= description=Inspect any book in a chiseled bookshelf. minecraft_version_range=[1.21.8, 1.22) -neo_form_version=1.21.8-20250717.133445 +# https://projects.neoforged.net/neoforged/neoform +neo_form_version=1.21.9-pre1-20250916.160523 # The version of ParchmentMC that is used, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions parchment_minecraft=1.21.8 parchment_version=2025.07.20 # Fabric -fabric_version=0.132.0+1.21.8 +fabric_version=0.133.7+1.21.9 fabric_loader_version=0.17.2 # NeoForge -neoforge_version=21.8.39 +neoforge_version=21.8.47 neoforge_loader_version_range=[4,) # Gradle @@ -32,4 +33,4 @@ org.gradle.daemon=false # Global dep YAML_snake=2.4 cloth_config=19.0.147 -mod_menu=15.0.0-beta.3 \ No newline at end of file +mod_menu=15.0.0 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cea7a79..ca025c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 358a557..a46a64d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,6 +3,12 @@ pluginManagement { gradlePluginPortal() mavenCentral() + maven { + name = 'Fabric' + url = uri('https://maven.fabricmc.net') + } + + /* exclusiveContent { forRepository { maven { @@ -14,7 +20,9 @@ pluginManagement { includeGroup('net.fabricmc') includeGroup('fabric-loom') } - } + }*/ + + exclusiveContent { forRepository { maven { @@ -50,4 +58,4 @@ include('common') include('fabric') include('neoforge') -include 'spigot' \ No newline at end of file +// include 'spigot' \ No newline at end of file