diff --git a/build.gradle b/build.gradle index d766763..0e03b79 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" // Fabric API. This is technically optional, but you probably want it anyway. - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + // modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" modImplementation include("com.github.Chocohead:Fabric-ASM:v2.3") { exclude (group: "net.fabricmc.fabric-api") diff --git a/src/main/java/me/melontini/recipebookispain/EarlyRiser.java b/src/main/java/me/melontini/recipebookispain/EarlyRiser.java deleted file mode 100644 index 9f55395..0000000 --- a/src/main/java/me/melontini/recipebookispain/EarlyRiser.java +++ /dev/null @@ -1,25 +0,0 @@ -package me.melontini.recipebookispain; - -import com.chocohead.mm.api.ClassTinkerers; -import com.chocohead.mm.api.EnumAdder; -import net.fabricmc.api.EnvType; -import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder; -import net.fabricmc.fabric.impl.item.group.ItemGroupExtensions; -import net.fabricmc.fabric.impl.registry.sync.FabricRegistryInit; -import net.fabricmc.loader.api.FabricLoader; -import net.fabricmc.loader.api.MappingResolver; -import net.minecraft.client.MinecraftClient; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.util.registry.Registry; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -public class EarlyRiser implements Runnable{ - @Override - public void run() { - } -} diff --git a/src/main/java/me/melontini/recipebookispain/mixin/RecipeBookGroupMixin.java b/src/main/java/me/melontini/recipebookispain/mixin/RecipeBookGroupMixin.java index aabf4ff..ad2a272 100644 --- a/src/main/java/me/melontini/recipebookispain/mixin/RecipeBookGroupMixin.java +++ b/src/main/java/me/melontini/recipebookispain/mixin/RecipeBookGroupMixin.java @@ -22,11 +22,6 @@ import java.util.List; @Unique public class RecipeBookGroupMixin { //me when I can't use Fabric ASM - //So much sinnery here - //this is a mess btw - - //private final static synthetic [Lnet/minecraft/client/recipebook/RecipeBookGroup; field_1805 - @Shadow @Final @Mutable diff --git a/src/main/java/me/melontini/recipebookispain/mixin/RecipeBookWidgetMixin.java b/src/main/java/me/melontini/recipebookispain/mixin/RecipeBookWidgetMixin.java index 6ef7c1d..d367f30 100644 --- a/src/main/java/me/melontini/recipebookispain/mixin/RecipeBookWidgetMixin.java +++ b/src/main/java/me/melontini/recipebookispain/mixin/RecipeBookWidgetMixin.java @@ -115,6 +115,7 @@ public abstract class RecipeBookWidgetMixin { } } + @Unique private void updatePages() { this.nextPageButton.visible = this.pages > 0 && page < this.pages; this.prevPageButton.visible = this.pages > 0 && page != 0; @@ -127,7 +128,7 @@ public abstract class RecipeBookWidgetMixin { groupTab.clear(); this.pages = 0; int p = 0; - //I'm in pain + for (RecipeGroupButtonWidget widget : this.tabButtons) { RecipeBookGroup recipeBookGroup = widget.getCategory(); if (recipeBookGroup == RecipeBookGroup.CRAFTING_SEARCH || recipeBookGroup == RecipeBookGroup.FURNACE_SEARCH || widget.hasKnownRecipes(recipeBook)) { @@ -137,7 +138,6 @@ public abstract class RecipeBookWidgetMixin { } this.pages = (int) Math.ceil(p / 6); - //RecipeBookIsPainClient.LOGGER.info(groupTab); ci.cancel(); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index ccdca36..08748cf 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -17,17 +17,13 @@ ], "main": [ "me.melontini.recipebookispain.RecipeBookIsPain" - ], - "mm:early_risers": [ - "me.melontini.recipebookispain.EarlyRiser" ] }, "mixins": [ "recipe-book-is-pain.mixins.json" ], "depends": { - "fabricloader": ">=0.14.8", - "fabric": "*", - "minecraft": "1.19" + "fabricloader": "*", + "minecraft": ">=1.19" } }