From 09e6cb348537cc24adfb355b4a34355d0acf493e Mon Sep 17 00:00:00 2001 From: melontini <104443436+melontini@users.noreply.github.com> Date: Sat, 10 Jun 2023 13:14:10 +0700 Subject: [PATCH] 1.20 --- .github/workflows/publish.yml | 2 +- CHANGELOG.md | 2 +- gradle.properties | 10 +++++----- .../recipebookispain/RecipeBookIsPainClient.java | 10 +++++----- .../recipebookispain/mixin/ClientRecipeBookMixin.java | 2 +- .../me/melontini/recipebookispain/mixin/ItemMixin.java | 4 ++-- .../recipebookispain/mixin/RecipeBookWidgetMixin.java | 8 ++++---- .../recipebookispain/mixin/RecipeGroupButtonMixin.java | 8 ++++---- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9b44503..4ef4466 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -34,7 +34,7 @@ jobs: version: ${{ env.VERSION_PLAIN }} game-versions: | - 1.19.4 + 1.20 loaders: | fabric diff --git a/CHANGELOG.md b/CHANGELOG.md index 082f517..949fbf1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ ### What's new: -* Fixed smoker crash. \ No newline at end of file +* 1.20 update. \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index d08d5eb..68970fe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,13 +4,13 @@ systemProp.org.gradle.internal.http.socketTimeout=180000 org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.19.4 -yarn_mappings=1.19.4+build.1 +minecraft_version=1.20 +yarn_mappings=1.20+build.1 loader_version=0.14.19 # Mod Properties -mod_version=0.9.3-1.19.4 +mod_version=0.9.3-1.20 maven_group=me.melontini archives_base_name=recipe-book-is-pain -cracker_util=v0.4.2-1.19.4 -owo_version=0.10.3+1.19.4 +cracker_util=v0.5.0-1.20 +owo_version=0.11.0+1.20 diff --git a/src/main/java/me/melontini/recipebookispain/RecipeBookIsPainClient.java b/src/main/java/me/melontini/recipebookispain/RecipeBookIsPainClient.java index 71c8739..06afe01 100644 --- a/src/main/java/me/melontini/recipebookispain/RecipeBookIsPainClient.java +++ b/src/main/java/me/melontini/recipebookispain/RecipeBookIsPainClient.java @@ -8,9 +8,9 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.recipebook.RecipeGroupButtonWidget; import net.minecraft.client.recipebook.RecipeBookGroup; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.item.ItemGroup; import org.apache.logging.log4j.LogManager; @@ -25,20 +25,20 @@ public class RecipeBookIsPainClient implements ClientModInitializer { public static Map RECIPE_BOOK_GROUP_TO_ITEM_GROUP = new HashMap<>(); public static Map ITEM_GROUP_TO_RECIPE_BOOK_GROUP = new HashMap<>(); - public static boolean rbip$renderOwo(MatrixStack matrices, int i, RecipeGroupButtonWidget widget, ItemGroup group) { + public static boolean rbip$renderOwo(DrawContext context, int i, RecipeGroupButtonWidget widget, ItemGroup group) { if (group instanceof OwoItemGroup owoItemGroup) { MinecraftClient client = MinecraftClient.getInstance(); double e = client.mouse.getX() * client.getWindow().getScaledWidth() / client.getWindow().getWidth(); double f = client.mouse.getY() * client.getWindow().getScaledHeight() / client.getWindow().getHeight(); - owoItemGroup.icon().render(matrices, widget.getX() + 9 + i, widget.getY() + 5, (int) e, (int) f, client.getTickDelta()); + owoItemGroup.icon().render(context, widget.getX() + 9 + i, widget.getY() + 5, (int) e, (int) f, client.getTickDelta()); return true; } return false; } - public static boolean renderCracker(MatrixStack matrices, int i, RecipeGroupButtonWidget widget, ItemGroup group) { + public static boolean renderCracker(DrawContext context, int i, RecipeGroupButtonWidget widget, ItemGroup group) { if (group.shouldAnimateIcon()) { - group.getIconAnimation().animateIcon(matrices, widget.getX() + 9 + i, widget.getY() + 5, widget.isToggled(), false); + group.getIconAnimation().animateIcon(context, widget.getX() + 9 + i, widget.getY() + 5, widget.isToggled(), false); return true; } return false; diff --git a/src/main/java/me/melontini/recipebookispain/mixin/ClientRecipeBookMixin.java b/src/main/java/me/melontini/recipebookispain/mixin/ClientRecipeBookMixin.java index 255b0b7..63bbc1c 100644 --- a/src/main/java/me/melontini/recipebookispain/mixin/ClientRecipeBookMixin.java +++ b/src/main/java/me/melontini/recipebookispain/mixin/ClientRecipeBookMixin.java @@ -28,7 +28,7 @@ public class ClientRecipeBookMixin { private static final CombinedDynamicRegistries RBIP$THANKS = ClientDynamicRegistryType.createCombinedDynamicRegistries(); @Inject(at = @At("TAIL"), method = "") private static void rbip$setupGroups(CallbackInfo ci) { - ItemGroups.updateDisplayContext(FeatureSet.of(FeatureFlags.BUNDLE, FeatureFlags.UPDATE_1_20, FeatureFlags.VANILLA), true, RBIP$THANKS.getCombinedRegistryManager()); + ItemGroups.updateDisplayContext(FeatureSet.of(FeatureFlags.BUNDLE, FeatureFlags.VANILLA), true, RBIP$THANKS.getCombinedRegistryManager()); ItemGroups.getGroups().stream().filter(group -> group.getType() != ItemGroup.Type.INVENTORY && group.getType() != ItemGroup.Type.HOTBAR && group.getType() != ItemGroup.Type.SEARCH) .forEach(group -> group.getSearchTabStacks().forEach(stack -> { diff --git a/src/main/java/me/melontini/recipebookispain/mixin/ItemMixin.java b/src/main/java/me/melontini/recipebookispain/mixin/ItemMixin.java index 7555905..cdd9c0e 100644 --- a/src/main/java/me/melontini/recipebookispain/mixin/ItemMixin.java +++ b/src/main/java/me/melontini/recipebookispain/mixin/ItemMixin.java @@ -8,11 +8,11 @@ import org.spongepowered.asm.mixin.Mixin; @Mixin(Item.class) public class ItemMixin implements ItemAccess { - public ItemGroup rbip$possibleGroup = ItemGroups.getDefaultTab(); + public ItemGroup rbip$possibleGroup; @Override public ItemGroup rbip$getPossibleGroup() { - return rbip$possibleGroup; + return rbip$possibleGroup != null ? rbip$possibleGroup : ItemGroups.getDefaultTab(); } @Override diff --git a/src/main/java/me/melontini/recipebookispain/mixin/RecipeBookWidgetMixin.java b/src/main/java/me/melontini/recipebookispain/mixin/RecipeBookWidgetMixin.java index 09f50be..3f648b3 100644 --- a/src/main/java/me/melontini/recipebookispain/mixin/RecipeBookWidgetMixin.java +++ b/src/main/java/me/melontini/recipebookispain/mixin/RecipeBookWidgetMixin.java @@ -2,9 +2,9 @@ package me.melontini.recipebookispain.mixin; import me.melontini.recipebookispain.RecipeBookIsPainClient; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.recipebook.RecipeBookWidget; import net.minecraft.client.gui.screen.recipebook.RecipeGroupButtonWidget; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.item.ItemGroups; import net.minecraft.text.Text; import org.spongepowered.asm.mixin.Final; @@ -25,16 +25,16 @@ public abstract class RecipeBookWidgetMixin { private List tabButtons; @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/math/MatrixStack;pop()V", shift = At.Shift.BEFORE), method = "render") - private void rbip$render(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) { + private void rbip$render(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) { if (client.currentScreen != null) { this.tabButtons.stream().filter(widget -> widget.visible && widget.isHovered()).forEach(widget -> { if (widget.getCategory().name().contains("_SEARCH")) { - client.currentScreen.renderTooltip(matrices, ItemGroups.getSearchGroup().getDisplayName(), mouseX, mouseY); + context.drawTooltip(client.textRenderer, ItemGroups.getSearchGroup().getDisplayName(), mouseX, mouseY); } else { if (RecipeBookIsPainClient.RECIPE_BOOK_GROUP_TO_ITEM_GROUP.get(widget.getCategory()) != null) { Text text = RecipeBookIsPainClient.RECIPE_BOOK_GROUP_TO_ITEM_GROUP.get(widget.getCategory()).getDisplayName(); if (text != null) { - client.currentScreen.renderTooltip(matrices, text, mouseX, mouseY); + context.drawTooltip(client.textRenderer, text, mouseX, mouseY); } } } diff --git a/src/main/java/me/melontini/recipebookispain/mixin/RecipeGroupButtonMixin.java b/src/main/java/me/melontini/recipebookispain/mixin/RecipeGroupButtonMixin.java index 3218333..e243b2d 100644 --- a/src/main/java/me/melontini/recipebookispain/mixin/RecipeGroupButtonMixin.java +++ b/src/main/java/me/melontini/recipebookispain/mixin/RecipeGroupButtonMixin.java @@ -1,11 +1,11 @@ package me.melontini.recipebookispain.mixin; import me.melontini.recipebookispain.RecipeBookIsPainClient; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.recipebook.RecipeGroupButtonWidget; import net.minecraft.client.gui.widget.ToggleButtonWidget; import net.minecraft.client.recipebook.RecipeBookGroup; import net.minecraft.client.render.item.ItemRenderer; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.item.ItemGroup; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -28,20 +28,20 @@ public abstract class RecipeGroupButtonMixin extends ToggleButtonWidget { } @Inject(at = @At("HEAD"), method = "renderIcons", cancellable = true) - private void rbip$render(MatrixStack matrices, ItemRenderer itemRenderer, CallbackInfo ci) { + private void rbip$render(DrawContext context, ItemRenderer itemRenderer, CallbackInfo ci) { ItemGroup group = RecipeBookIsPainClient.RECIPE_BOOK_GROUP_TO_ITEM_GROUP.get(this.category); if (group == null) return; int i = this.toggled ? -2 : 0; if (RecipeBookIsPainClient.isOwOLoaded) { - if (rbip$renderOwo(matrices, i, (RecipeGroupButtonWidget) (Object) this, group)) { + if (rbip$renderOwo(context, i, (RecipeGroupButtonWidget) (Object) this, group)) { ci.cancel(); return; } } if (RecipeBookIsPainClient.isCrackerContentLoaded) { - if (renderCracker(matrices, i, (RecipeGroupButtonWidget) (Object) this, group)) { + if (renderCracker(context, i, (RecipeGroupButtonWidget) (Object) this, group)) { ci.cancel(); } } -- 2.51.2