From 04b0ba8ae0c821b72c89c46ab36d447e1756d0a6 Mon Sep 17 00:00:00 2001 From: TheClashFruit Date: Sun, 14 Jul 2024 17:23:33 +0200 Subject: [PATCH] fix: add the enchantment books back to the tools tab for 1.21 --- changelogs/2.0.0-rc.2.md | 4 --- changelogs/2.0.0.md | 3 ++ gradle.properties | 2 +- .../cc/mixin/ItemGroupsMixin.java | 34 +++++++++++++------ 4 files changed, 27 insertions(+), 16 deletions(-) delete mode 100644 changelogs/2.0.0-rc.2.md create mode 100644 changelogs/2.0.0.md diff --git a/changelogs/2.0.0-rc.2.md b/changelogs/2.0.0-rc.2.md deleted file mode 100644 index 0162003..0000000 --- a/changelogs/2.0.0-rc.2.md +++ /dev/null @@ -1,4 +0,0 @@ -### New -* Added Tuff Blocks for 1.21+ - -### Fixes diff --git a/changelogs/2.0.0.md b/changelogs/2.0.0.md new file mode 100644 index 0000000..72051e7 --- /dev/null +++ b/changelogs/2.0.0.md @@ -0,0 +1,3 @@ +### Fixes +* Added the tuff blocks +* Enchantment books are back in the tools tab. \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 0e22e43..7552ec7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,5 +3,5 @@ org.gradle.jvmargs=-Xmx2G mod.name=Cluttered Creative mod.id=cc -mod.version=2.0.0-rc.2 +mod.version=2.0.0 mod.group=me.theclashfruit \ No newline at end of file diff --git a/src/main/java/me/theclashfruit/cc/mixin/ItemGroupsMixin.java b/src/main/java/me/theclashfruit/cc/mixin/ItemGroupsMixin.java index bb161ca..83103df 100644 --- a/src/main/java/me/theclashfruit/cc/mixin/ItemGroupsMixin.java +++ b/src/main/java/me/theclashfruit/cc/mixin/ItemGroupsMixin.java @@ -1,12 +1,18 @@ package me.theclashfruit.cc.mixin; import net.minecraft.block.Blocks; +import net.minecraft.client.gui.screen.ingame.EnchantmentScreen; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.enchantment.EnchantmentLevelBasedValue; import net.minecraft.enchantment.EnchantmentLevelEntry; import net.minecraft.enchantment.Enchantments; +import net.minecraft.enchantment.effect.EnchantmentEffectEntry; +import net.minecraft.enchantment.effect.EnchantmentValueEffect; +import net.minecraft.entity.Entity; import net.minecraft.item.*; import net.minecraft.potion.Potions; +import net.minecraft.predicate.item.EnchantmentPredicate; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; @@ -23,6 +29,7 @@ import org.spongepowered.asm.mixin.gen.Invoker; //#if MC >= 1.20.6 import net.minecraft.util.Identifier; +import net.minecraft.component.type.ItemEnchantmentsComponent; import net.minecraft.component.type.PotionContentsComponent; //#else //$$ import net.minecraft.enchantment.EnchantmentTarget; @@ -31,6 +38,7 @@ import net.minecraft.component.type.PotionContentsComponent; import java.util.EnumSet; import java.util.Set; +import java.util.stream.IntStream; import static me.theclashfruit.cc.ClutteredCreative.LOGGER; import static net.minecraft.item.ItemGroups.*; @@ -405,12 +413,6 @@ public class ItemGroupsMixin { content.add(Items.STONE_BRICK_STAIRS); content.add(Items.MUD_BRICK_STAIRS); - //#if MC >= 1.21 - content.add(Items.TUFF_BRICK_STAIRS); - content.add(Items.POLISHED_TUFF_STAIRS); - content.add(Items.TUFF_STAIRS); - //#endif - content.add(Items.MYCELIUM); content.add(Items.NETHER_BRICKS); content.add(Items.CRACKED_NETHER_BRICKS); @@ -565,6 +567,12 @@ public class ItemGroupsMixin { content.add(Items.DEEPSLATE_BRICK_STAIRS); content.add(Items.DEEPSLATE_TILE_STAIRS); + //#if MC >= 1.21 + content.add(Items.TUFF_BRICK_STAIRS); + content.add(Items.POLISHED_TUFF_STAIRS); + content.add(Items.TUFF_STAIRS); + //#endif + content.add(Items.POLISHED_GRANITE_SLAB); content.add(Items.SMOOTH_RED_SANDSTONE_SLAB); content.add(Items.MOSSY_STONE_BRICK_SLAB); @@ -1553,12 +1561,16 @@ public class ItemGroupsMixin { content.add(Items.SHEARS); //#if MC >= 1.21 - LOGGER.info("WHY TF 1.21 HAS TO FUCK SHIT UP? HOW DO I MAKE AN ENCHANTED BOOK???????????????"); - - displayContext.lookup().getOptionalWrapper(RegistryKeys.ENCHANTMENT).ifPresent((impl) -> { - LOGGER.info(impl.getRegistryKey().getValue().getPath()); + displayContext.lookup().getOptionalWrapper(RegistryKeys.ENCHANTMENT).ifPresent(impl -> { + content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(impl.getOrThrow(Enchantments.EFFICIENCY), 5))); + content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(impl.getOrThrow(Enchantments.SILK_TOUCH), 1))); + content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(impl.getOrThrow(Enchantments.UNBREAKING), 3))); + content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(impl.getOrThrow(Enchantments.FORTUNE), 3))); + content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(impl.getOrThrow(Enchantments.LUCK_OF_THE_SEA), 3))); + content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(impl.getOrThrow(Enchantments.LURE), 3))); + content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(impl.getOrThrow(Enchantments.MENDING), 1))); + content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(impl.getOrThrow(Enchantments.VANISHING_CURSE), 1))); }); - //#else //$$ content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(Enchantments.EFFICIENCY, 5))); //$$ content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(Enchantments.SILK_TOUCH, 1)));