use remote trinkets

gradle.properties

@@ -10,7 +10,7 @@ maven_group = ru.pinkgoosik
 
 # Mod Properties
 mod_name = Winterly
-mod_version = 0.11.1+1.21
+mod_version = 0.11.2+1.21
 mod_description = Winter expansion mod adding cold and sloppy stuff.
 mod_id = winterly
 homepage_url = https://github.com/tyap-lyap/winterly
@@ -30,16 +30,15 @@ enabled_platforms = fabric,neoforge
 # Fabric
 fabric_loader_version = 0.15.11
 fabric_api_version = 0.100.6+1.21
-trinkets_version = 3.8.0
-cca_version = 6.1.0
+trinkets_version = 3.10.0
 cloth_config = 15.0.127
 modmenu_version = 11.0.1
 owo_lib = 0.12.10+1.21
+emi_version = 1.1.10+1.21
 
 # NeoForge
 neoforge_version = 21.0.78-beta
 neoforge_version_range = [21.0,)
-curios_version = 7.0.0-beta.3+1.20.4
 curios_kirill = 9.0.4+1.21
 accessories = 1.0.0-beta.17+1.21
 

winterly-fabric/build.gradle.kts

@@ -37,17 +37,12 @@ dependencies {
     modImplementation("net.fabricmc:fabric-loader:${rootProject.property("fabric_loader_version")}")
     modApi("net.fabricmc.fabric-api:fabric-api:${rootProject.property("fabric_api_version")}")
 
-//	modLocalRuntime("dev.emi:trinkets:${rootProject.property("trinkets_version")}")
-	modApi(files("trinkets-3.10.0.jar"))
-	modImplementation("dev.onyxstudios.cardinal-components-api:cardinal-components-entity:${rootProject.property("cca_version")}")
-    modImplementation("dev.onyxstudios.cardinal-components-api:cardinal-components-base:${rootProject.property("cca_version")}")
-
+	modApi("dev.emi:trinkets:${rootProject.property("trinkets_version")}")
     modApi("io.wispforest:owo-lib:${rootProject.property("owo_lib")}")
 	modApi("me.shedaniel.cloth:cloth-config-fabric:${rootProject.property("cloth_config")}") { exclude("net.fabricmc.fabric-api") }
 	modApi("com.terraformersmc:modmenu:${rootProject.property("modmenu_version")}")
 
-	//modLocalRuntime "maven.modrinth:here-be-no-dragons:1.0.0"
-	modLocalRuntime("dev.emi:emi-fabric:1.1.10+1.21")
+	modLocalRuntime("dev.emi:emi-fabric:${rootProject.property("emi_version")}")
 
     common(project(":winterly-common", configuration = "namedElements")) { isTransitive = false }
     shadowCommon(project(":winterly-common", configuration = "transformProductionFabric")) { isTransitive = false }

winterly-neoforge/build.gradle.kts

@@ -24,31 +24,22 @@ configurations {
 }
 
 repositories {
-//    maven("https://maven.theillusivec4.top/")
     maven("https://maven.shedaniel.me/")
     maven("https://maven.terraformersmc.com")
-
     maven("https://maven.wispforest.io/releases")
     maven("https://maven.su5ed.dev/releases")
     maven("https://maven.fabricmc.net")
-
     maven("https://maven.octo-studios.com/releases")
 }
 
 dependencies {
     neoForge("net.neoforged:neoforge:${rootProject.property("neoforge_version")}")
 
-	//modCompileOnly("top.theillusivec4.curios:curios-neoforge:${rootProject.property("curios_version")}:api")
-    // Use the full Curios API jar at runtime
-    //modCompileOnly("top.theillusivec4.curios:curios-neoforge:${rootProject.property("curios_version")}")
-
     modApi("top.theillusivec4.curios:curios-neoforge:${rootProject.property("curios_kirill")}")
-
 	modApi("me.shedaniel.cloth:cloth-config-neoforge:${rootProject.property("cloth_config")}")
+//	modApi("io.wispforest:accessories-neoforge:${rootProject.property("accessories")}")
 
-//	implementation("io.wispforest:accessories-neoforge:${rootProject.property("accessories")}")
-
-    modLocalRuntime("dev.emi:emi-neoforge:1.1.10+1.21")
+    modLocalRuntime("dev.emi:emi-neoforge:${rootProject.property("emi_version")}")
 
     common(project(":winterly-common", configuration = "namedElements")) { isTransitive = false }
     shadowCommon(project(":winterly-common", configuration = "transformProductionNeoForge")) { isTransitive = false }

winterly-neoforge/src/main/java/ru/pinkgoosik/winterly/neoforge/item/SantaHatItem.java

@@ -27,8 +27,6 @@ public SantaHatItem(Item.Properties settings, String color) {
 	@Override
 	public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltip, TooltipFlag tooltipFlag) {
 		if(!ModList.get().isLoaded("curios")) {
-			tooltip.add(Component.translatable("tag.winterly.cosmetic").withStyle(ChatFormatting.GRAY));
-			tooltip.add(Component.nullToEmpty(" "));
 			Language lang = Language.getInstance();
 			String key = "tip.winterly.requires_curios.";
 
@@ -41,10 +39,6 @@ public void appendHoverText(ItemStack stack, TooltipContext context, List<Compon
 				}
 			}
 		}
-		else {
-			tooltip.add(Component.nullToEmpty(" "));
-			tooltip.add(Component.translatable("tag.winterly.cosmetic").withStyle(ChatFormatting.GRAY));
-		}
 	}
 
 }

winterly-neoforge/src/main/java/ru/pinkgoosik/winterly/neoforge/item/ScarfItem.java

@@ -13,6 +13,7 @@
 
 import java.util.List;
 
+@SuppressWarnings("NullableProblems")
 public class ScarfItem extends CommonScarfItem {
 
     public ScarfItem(Item.Properties settings, String color) {
@@ -26,8 +27,6 @@ public ScarfItem(Item.Properties settings, String color) {
 	@Override
 	public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltip, TooltipFlag tooltipFlag) {
 		if(!ModList.get().isLoaded("curios")) {
-			tooltip.add(Component.translatable("tag.winterly.cosmetic").withStyle(ChatFormatting.GRAY));
-			tooltip.add(Component.nullToEmpty(" "));
 			Language lang = Language.getInstance();
 			String key = "tip.winterly.requires_curios.";
 
@@ -40,9 +39,5 @@ public void appendHoverText(ItemStack stack, TooltipContext context, List<Compon
 				}
 			}
 		}
-		else {
-			tooltip.add(Component.nullToEmpty(" "));
-			tooltip.add(Component.translatable("tag.winterly.cosmetic").withStyle(ChatFormatting.GRAY));
-		}
     }
 }