From 0a475b38218a10a849dff2589bb1edba2e270ab9 Mon Sep 17 00:00:00 2001 From: TheClashFruit Date: Mon, 14 Aug 2023 20:43:56 +0200 Subject: [PATCH] feat: pain --- .../cc/mixin/CreativeInventoryScreenMixin.java | 18 ++++++++++++++---- src/main/resources/cc.accesswidener | 4 +++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/main/java/me/theclashfruit/cc/mixin/CreativeInventoryScreenMixin.java b/src/main/java/me/theclashfruit/cc/mixin/CreativeInventoryScreenMixin.java index f6c29ac..ec90679 100644 --- a/src/main/java/me/theclashfruit/cc/mixin/CreativeInventoryScreenMixin.java +++ b/src/main/java/me/theclashfruit/cc/mixin/CreativeInventoryScreenMixin.java @@ -1,12 +1,22 @@ package me.theclashfruit.cc.mixin; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.ingame.AbstractInventoryScreen; import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen; +import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.client.gui.screen.ingame.InventoryScreen; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemGroups; +import net.minecraft.item.ItemStack; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; +import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import org.spongepowered.asm.mixin.Shadow; @Mixin(CreativeInventoryScreen.class) public class CreativeInventoryScreenMixin { @@ -21,7 +31,7 @@ public class CreativeInventoryScreenMixin { int j = 32; int k = 32 * i; if (group.isSpecial()) { - k = 176 - 32 * (6 - i) + 1; + k = 176 - 32 * (6 - i) - 7; } return k; } diff --git a/src/main/resources/cc.accesswidener b/src/main/resources/cc.accesswidener index 71e6311..d9d5be0 100644 --- a/src/main/resources/cc.accesswidener +++ b/src/main/resources/cc.accesswidener @@ -1,3 +1,5 @@ accessWidener v1 named -accessible method net/minecraft/item/ItemGroup$Builder type (Lnet/minecraft/item/ItemGroup$Type;)Lnet/minecraft/item/ItemGroup$Builder; \ No newline at end of file +accessible method net/minecraft/item/ItemGroup$Builder type (Lnet/minecraft/item/ItemGroup$Type;)Lnet/minecraft/item/ItemGroup$Builder; + +# accessible method net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen renderTabIcon (Lnet/minecraft/gui/DrawContext; Lnet/minecraft/item/ItemGroup;)V \ No newline at end of file