From 42da315531aa8d5afa33d5f1acd044718aeacbce Mon Sep 17 00:00:00 2001 From: TheClashFruit Date: Sun, 14 Jul 2024 15:21:15 +0200 Subject: [PATCH] feat: add tuff stuff --- changelogs/2.0.0-rc.1.md | 1 - changelogs/2.0.0-rc.2.md | 4 ++ gradle.properties | 2 +- root.gradle.kts | 2 +- .../cc/mixin/ItemGroupsMixin.java | 55 +++++++++++++++---- 5 files changed, 50 insertions(+), 14 deletions(-) create mode 100644 changelogs/2.0.0-rc.2.md diff --git a/changelogs/2.0.0-rc.1.md b/changelogs/2.0.0-rc.1.md index 18c64da..ef54e0b 100644 --- a/changelogs/2.0.0-rc.1.md +++ b/changelogs/2.0.0-rc.1.md @@ -1,7 +1,6 @@ The mod has been revived from the dead! ### New - * 1.21 Support * !! Enchantment books are missing from the tools tab. diff --git a/changelogs/2.0.0-rc.2.md b/changelogs/2.0.0-rc.2.md new file mode 100644 index 0000000..0162003 --- /dev/null +++ b/changelogs/2.0.0-rc.2.md @@ -0,0 +1,4 @@ +### New +* Added Tuff Blocks for 1.21+ + +### Fixes diff --git a/gradle.properties b/gradle.properties index cbe881c..0e22e43 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.1 +mod.version=2.0.0-rc.2 mod.group=me.theclashfruit \ No newline at end of file diff --git a/root.gradle.kts b/root.gradle.kts index 6d68642..e5f72ab 100644 --- a/root.gradle.kts +++ b/root.gradle.kts @@ -5,7 +5,7 @@ plugins { preprocess { val fabric_1_21 = createNode("1.21-fabric", 1210, "yarn") val fabric_1_20_6 = createNode("1.20.6-fabric", 1206, "yarn") - val fabric_1_20_5 = createNode("1.20.5-fabric", 1205, "yarn") + val fabric_1_20_5 = createNode("1.20.5-fabric", 1205, "yarn") // broken due to upstream issues val fabric_1_20_4 = createNode("1.20.4-fabric", 1204, "yarn") val fabric_1_20_3 = createNode("1.20.3-fabric", 1203, "yarn") val fabric_1_20_2 = createNode("1.20.2-fabric", 1202, "yarn") diff --git a/src/main/java/me/theclashfruit/cc/mixin/ItemGroupsMixin.java b/src/main/java/me/theclashfruit/cc/mixin/ItemGroupsMixin.java index 12fb6cf..bb161ca 100644 --- a/src/main/java/me/theclashfruit/cc/mixin/ItemGroupsMixin.java +++ b/src/main/java/me/theclashfruit/cc/mixin/ItemGroupsMixin.java @@ -1,13 +1,18 @@ package me.theclashfruit.cc.mixin; import net.minecraft.block.Blocks; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.EnchantmentLevelEntry; import net.minecraft.enchantment.Enchantments; import net.minecraft.item.*; import net.minecraft.potion.Potions; +import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.registry.tag.InstrumentTags; import net.minecraft.registry.tag.ItemTags; import net.minecraft.registry.tag.TagKey; @@ -95,8 +100,6 @@ public class ItemGroupsMixin { */ @Overwrite public static ItemGroup registerAndGetDefault(Registry registry) { - LOGGER.info("ItemGroups Working!"); - final ItemGroup searchGroup = ItemGroup .create(ItemGroup.Row.TOP, 6) .displayName(Text.translatable("itemGroup.search")) @@ -389,12 +392,25 @@ public class ItemGroupsMixin { content.add(Items.CHISELED_DEEPSLATE); content.add(Items.REINFORCED_DEEPSLATE); + //#if MC >= 1.21 + content.add(Items.CHISELED_TUFF); + content.add(Items.POLISHED_TUFF); + content.add(Items.TUFF_BRICKS); + content.add(Items.CHISELED_TUFF_BRICKS); + //#endif + content.add(Items.MELON); content.add(Items.BRICK_STAIRS); 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); @@ -567,6 +583,12 @@ public class ItemGroupsMixin { content.add(Items.DEEPSLATE_BRICK_SLAB); content.add(Items.DEEPSLATE_TILE_SLAB); + //#if MC >= 1.21 + content.add(Items.TUFF_SLAB); + content.add(Items.POLISHED_TUFF_SLAB); + content.add(Items.TUFF_BRICK_SLAB); + //#endif + content.add(Items.DRIED_KELP_BLOCK); content.add(Items.CRYING_OBSIDIAN); @@ -746,6 +768,12 @@ public class ItemGroupsMixin { content.add(Items.DEEPSLATE_BRICK_WALL); content.add(Items.DEEPSLATE_TILE_WALL); + //#if MC >= 1.21 + content.add(Items.TUFF_WALL); + content.add(Items.POLISHED_TUFF_WALL); + content.add(Items.TUFF_BRICK_WALL); + //#endif + content.add(Items.ANVIL); content.add(Items.CHIPPED_ANVIL); content.add(Items.DAMAGED_ANVIL); @@ -1524,17 +1552,22 @@ public class ItemGroupsMixin { content.add(Items.SPYGLASS); content.add(Items.SHEARS); - //#if MC >= 1.20.6 - LOGGER.info("WHY TF 1.20.6 HAS TO FUCK SHIT UP? HOW DO I MAKE AN ENCHANTED BOOK???????????????"); + //#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()); + }); + //#else //$$ content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(Enchantments.EFFICIENCY, 5))); - //$$content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(Enchantments.SILK_TOUCH, 1))); - //$$content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(Enchantments.UNBREAKING, 3))); - //$$content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(Enchantments.FORTUNE, 3))); - //$$content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(Enchantments.LUCK_OF_THE_SEA, 3))); - //$$content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(Enchantments.LURE, 3))); - //$$content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(Enchantments.MENDING, 1))); - //$$content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(Enchantments.VANISHING_CURSE, 1))); + //$$ content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(Enchantments.SILK_TOUCH, 1))); + //$$ content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(Enchantments.UNBREAKING, 3))); + //$$ content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(Enchantments.FORTUNE, 3))); + //$$ content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(Enchantments.LUCK_OF_THE_SEA, 3))); + //$$ content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(Enchantments.LURE, 3))); + //$$ content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(Enchantments.MENDING, 1))); + //$$ content.add(EnchantedBookItem.forEnchantment(new EnchantmentLevelEntry(Enchantments.VANISHING_CURSE, 1))); //#endif content.add(Items.LEAD);