From 9fa3e46210f1b2147387e7c8711b6f318e947996 Mon Sep 17 00:00:00 2001 From: TheClashFruit Date: Sun, 24 Sep 2023 12:38:04 +0200 Subject: [PATCH] feat: update to 1.20.2 --- .idea/.gitignore | 8 -- .idea/discord.xml | 7 - .idea/gradle.xml | 1 - .idea/jarRepositories.xml | 32 ++--- .idea/misc.xml | 4 +- .idea/runConfigurations/Minecraft_Client.xml | 2 +- .idea/runConfigurations/Minecraft_Server.xml | 4 +- .idea/uiDesigner.xml | 124 ------------------ build.gradle | 2 +- gradle.properties | 11 +- .../theclashfruit/cc/ClutteredCreative.java | 8 -- .../cc/mixin/ItemGroupsMixin.java | 10 +- 12 files changed, 33 insertions(+), 180 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/discord.xml delete mode 100644 .idea/uiDesigner.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/discord.xml b/.idea/discord.xml deleted file mode 100644 index d8e9561..0000000 --- a/.idea/discord.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ce1c62c..f9163b4 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,6 +1,5 @@ - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index fe0b0da..de0c428 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,5 @@ - - - + \ No newline at end of file diff --git a/.idea/runConfigurations/Minecraft_Client.xml b/.idea/runConfigurations/Minecraft_Client.xml index fc4a27a..5105448 100644 --- a/.idea/runConfigurations/Minecraft_Client.xml +++ b/.idea/runConfigurations/Minecraft_Client.xml @@ -3,7 +3,7 @@ \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index 2b63946..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 3def28b..317afc4 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modLocalRuntime("maven.modrinth:modmenu:7.0.1") + modLocalRuntime("maven.modrinth:modmenu:${project.modmenu_version}") } loom { diff --git a/gradle.properties b/gradle.properties index db51c94..f8f5b1b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,15 +3,18 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.20 -yarn_mappings=1.20+build.1 +minecraft_version=1.20.2 +yarn_mappings=1.20.2+build.1 loader_version=0.14.22 # Mod Properties -mod_version = 1.0.0-rc.2 +mod_version = 1.0.0+mc1.20.2 maven_group = me.theclashfruit archives_base_name = cc # Dependencies # check this on https://modmuss50.me/fabric.html -fabric_version=0.83.0+1.20 +fabric_version=0.89.2+1.20.2 + +# Local Dev Mods +modmenu_version=8.0.0-beta.2 \ No newline at end of file diff --git a/src/main/java/me/theclashfruit/cc/ClutteredCreative.java b/src/main/java/me/theclashfruit/cc/ClutteredCreative.java index 283dcac..752e605 100644 --- a/src/main/java/me/theclashfruit/cc/ClutteredCreative.java +++ b/src/main/java/me/theclashfruit/cc/ClutteredCreative.java @@ -1,14 +1,6 @@ package me.theclashfruit.cc; import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; -import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; -import net.minecraft.item.*; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; -import net.minecraft.registry.RegistryKey; -import net.minecraft.text.Text; -import net.minecraft.util.Identifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/me/theclashfruit/cc/mixin/ItemGroupsMixin.java b/src/main/java/me/theclashfruit/cc/mixin/ItemGroupsMixin.java index b73eb49..0bf5c5d 100644 --- a/src/main/java/me/theclashfruit/cc/mixin/ItemGroupsMixin.java +++ b/src/main/java/me/theclashfruit/cc/mixin/ItemGroupsMixin.java @@ -7,19 +7,19 @@ import net.minecraft.enchantment.Enchantments; import net.minecraft.item.*; import net.minecraft.potion.PotionUtil; 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.tag.InstrumentTags; import net.minecraft.text.Text; -import net.minecraft.util.Identifier; import net.minecraft.village.raid.Raid; -import org.spongepowered.asm.mixin.*; -import org.spongepowered.asm.mixin.gen.Accessor; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.gen.Invoker; -import java.util.*; +import java.util.EnumSet; +import java.util.Set; import static me.theclashfruit.cc.ClutteredCreative.LOGGER; import static net.minecraft.item.ItemGroups.*;