From b4a847e4b58407466c3306e2c73991a538999aa4 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 26 Mar 2024 17:09:36 +0000 Subject: [PATCH] Update loom --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../unicopia/client/render/shader/ViewportShader.java | 3 +-- .../com/minelittlepony/unicopia/item/EnchantedStaffItem.java | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 51a392c2..285777fc 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { } plugins { id 'java-library' - id 'fabric-loom' version '0.12-SNAPSHOT' + id 'fabric-loom' version '1.5-SNAPSHOT' id 'com.modrinth.minotaur' version '2.+' id 'org.ajoberstar.reckon' version '0.13.0' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e750102e..db9a6b82 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/shader/ViewportShader.java b/src/main/java/com/minelittlepony/unicopia/client/render/shader/ViewportShader.java index ebef6c6a..21df38bc 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/render/shader/ViewportShader.java +++ b/src/main/java/com/minelittlepony/unicopia/client/render/shader/ViewportShader.java @@ -2,8 +2,7 @@ package com.minelittlepony.unicopia.client.render.shader; import java.io.IOException; -import javax.annotation.Nullable; - +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import com.google.common.collect.*; diff --git a/src/main/java/com/minelittlepony/unicopia/item/EnchantedStaffItem.java b/src/main/java/com/minelittlepony/unicopia/item/EnchantedStaffItem.java index b37d4cab..08798972 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/EnchantedStaffItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/EnchantedStaffItem.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Stream; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.ability.magic.Caster;