diff --git a/src/main/java/me/theclashfruit/cc/mixin/CreativeInventoryScreenMixin.java b/src/main/java/me/theclashfruit/cc/mixin/CreativeInventoryScreenMixin.java deleted file mode 100644 index ec90679..0000000 --- a/src/main/java/me/theclashfruit/cc/mixin/CreativeInventoryScreenMixin.java +++ /dev/null @@ -1,38 +0,0 @@ -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.Shadow; - -@Mixin(CreativeInventoryScreen.class) -public class CreativeInventoryScreenMixin { - - /** - * @author TheClashFruit - * @reason pre 1.19.3 inventory layout :3 - */ - @Overwrite - private int getTabX(ItemGroup group) { - int i = group.getColumn(); - int j = 32; - int k = 32 * i; - if (group.isSpecial()) { - k = 176 - 32 * (6 - i) - 7; - } - return k; - } -} diff --git a/src/main/java/me/theclashfruit/cc/mixin/ItemGroupsMixin.java b/src/main/java/me/theclashfruit/cc/mixin/ItemGroupsMixin.java index f9782cd..dfc6958 100644 --- a/src/main/java/me/theclashfruit/cc/mixin/ItemGroupsMixin.java +++ b/src/main/java/me/theclashfruit/cc/mixin/ItemGroupsMixin.java @@ -19,6 +19,7 @@ import java.util.EnumSet; import java.util.Set; import static me.theclashfruit.cc.ClutteredCreative.LOGGER; +import static net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen.TAB_WIDTH; import static net.minecraft.item.ItemGroups.*; @Mixin(ItemGroups.class) diff --git a/src/main/resources/cc.accesswidener b/src/main/resources/cc.accesswidener index d9d5be0..71e6311 100644 --- a/src/main/resources/cc.accesswidener +++ b/src/main/resources/cc.accesswidener @@ -1,5 +1,3 @@ accessWidener v1 named -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 +accessible method net/minecraft/item/ItemGroup$Builder type (Lnet/minecraft/item/ItemGroup$Type;)Lnet/minecraft/item/ItemGroup$Builder; \ No newline at end of file diff --git a/src/main/resources/cc.mixins.json b/src/main/resources/cc.mixins.json index f82ad3f..4e0dc43 100644 --- a/src/main/resources/cc.mixins.json +++ b/src/main/resources/cc.mixins.json @@ -8,7 +8,7 @@ "ItemGroupsMixin" ], "client": [ - "CreativeInventoryScreenMixin" + ], "injectors": { "defaultRequire": 1