diff --git a/build.gradle b/build.gradle index c2526fb1..2b6a5818 100644 --- a/build.gradle +++ b/build.gradle @@ -13,6 +13,8 @@ group = project.maven_group repositories { maven { url "https://maven.dblsaiko.net/" } maven { url "http://server.bbkr.space:8081/artifactory/libs-release/" } + maven { url "https://maven.fabricmc.net/" } + jcenter() } dependencies { @@ -20,30 +22,20 @@ dependencies { mappings "net.fabricmc:yarn:${project.minecraft_version}+build.${project.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - - optionalDependency "me.shedaniel:RoughlyEnoughItems:${project.rei_version}" - optionalDependency "me.shedaniel:RoughlyEnoughItems-api:${project.rei_version}" - optionalDependency "grondag:canvas-mc116:${project.canvas_version}" - compilelDependency "me.shedaniel.cloth.api:cloth-client-events-v0:${project.cloth_events_version}" - compilelDependency "me.shedaniel.cloth:config-2:${project.cloth_config_version}" + optional "me.shedaniel:RoughlyEnoughItems:${project.rei_version}" + optional "me.shedaniel:RoughlyEnoughItems-api:${project.rei_version}" + optional "grondag:canvas-mc116:${project.canvas_version}" } -def optionalDependency(String dep) { +def optional(String dep) { dependencies.modRuntime (dep) { exclude group: "net.fabricmc.fabric-api" - exclude module: "cloth-client-events-v0" - exclude module: "config-2" + exclude module: "fabric-loader" } dependencies.modCompileOnly (dep) { exclude group: "net.fabricmc.fabric-api" - exclude module: "cloth-client-events-v0" - exclude module: "config-2" - } -} -def compilelDependency(String dep) { - dependencies.modCompile (dep) { - exclude group: "net.fabricmc.fabric-api" + exclude module: "fabric-loader" } } diff --git a/gradle.properties b/gradle.properties index eede0001..f1075fa0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ # check these on https://fabricmc.net/use minecraft_version = 1.16.3 yarn_mappings = 28 - loader_version = 0.9.3+build.207 + loader_version = 0.10.1+build.209 # Mod Properties mod_version = 1.0.0 @@ -15,7 +15,7 @@ # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api fabric_version = 0.23.0+build.410-1.16 - cloth_config_version = 4.8.1 + cloth_config_version = 4.8.2 cloth_events_version = 1.4.5 - canvas_version = 1.0.+ + canvas_version = 1.0.989 rei_version = 5.6.0 \ No newline at end of file diff --git a/src/main/java/ru/betterend/compat/REIAlloyingCategory.java b/src/main/java/ru/betterend/compat/REIAlloyingCategory.java index b48c3641..c6f829bb 100644 --- a/src/main/java/ru/betterend/compat/REIAlloyingCategory.java +++ b/src/main/java/ru/betterend/compat/REIAlloyingCategory.java @@ -17,10 +17,12 @@ import me.shedaniel.rei.api.widgets.Widgets; import me.shedaniel.rei.gui.entries.RecipeEntry; import me.shedaniel.rei.gui.entries.SimpleRecipeEntry; import me.shedaniel.rei.gui.widget.Widget; + import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.TranslatableText; import net.minecraft.util.Identifier; + import ru.betterend.recipe.AlloyingRecipe; import ru.betterend.registry.BlockRegistry; import ru.betterend.util.LangUtil;