From 2244fe589e116cd1eb5598590e8ca46c00e88231 Mon Sep 17 00:00:00 2001 From: B1n_ry Date: Tue, 20 Feb 2024 22:25:45 +0100 Subject: [PATCH] Updated gradle publish plugin (possibly fixing multiple require slugs?) --- build.gradle | 27 +++++++------------ .../yigd/compat/TravelersBackpackCompat.java | 1 - .../b1n_ry/yigd/mixin/WorldRendererMixin.java | 1 - 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index 4fb5d903..6e06218e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'fabric-loom' version '1.5-SNAPSHOT' id 'maven-publish' - id "me.modmuss50.mod-publish-plugin" version "0.4.5" + id "me.modmuss50.mod-publish-plugin" version "0.5.1" } version = project.mod_version @@ -30,11 +30,13 @@ publishMods { end = project.minecraft_version } + javaVersions.add(JavaVersion.VERSION_17) + + clientRequired = true + serverRequired = true + projectSlug = project.archives_base_name; - requires { - slug = "fabric-api" - slug = "cloth-config" - } + requires("fabric-api", "cloth-config") } github { @@ -55,22 +57,18 @@ publishMods { end = project.minecraft_version } - requires { - slug = "fabric-api" - slug = "cloth-config" - } + requires("fabric-api", "cloth-config") } } repositories { maven { url "https://maven.shedaniel.me/" } // cloth_config maven { url "https://maven.terraformersmc.com/" } // mod_menu, trinkets - maven { url "https://maven.ladysnake.org/releases" } // cardinal_components + maven { url "https://maven.ladysnake.org/releases" } // Apoli dependency maven { url "https://server.bbkr.space/artifactory/libs-release" } // LibGUI maven { url "https://oss.sonatype.org/content/repositories/snapshots" } // Permission API maven { url "https://jitpack.io" } // Apoli maven { url "https://maven.nucleoid.xyz/" } // Common Protection API - maven { url 'https://maven.wispforest.io' } // owo maven { // Inventorio, travelers backpack, numismatic overhaul, levelz (curseforge maven) url "https://cursemaven.com" content { includeGroup "curse.maven" } @@ -104,13 +102,6 @@ dependencies { modCompileOnly "curse.maven:numismaticoverhaul-${project.numismatic_version}" modCompileOnly "com.github.apace100:apoli:${project.apoli_version}" modCompileOnly "curse.maven:levelz-${project.levelz_version}" - - // Dev dependencies -// modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}" -// modImplementation "dev.onyxstudios.cardinal-components-api:cardinal-components-base:${project.cardinal_components_version}" -// modImplementation "dev.onyxstudios.cardinal-components-api:cardinal-components-entity:${project.cardinal_components_version}" -// modImplementation ""maven.modrinth:libz:${project.libz_version}"" -// modImplementation "io.wispforest:owo-lib:${project.owo_version}" } processResources { diff --git a/src/main/java/com/b1n_ry/yigd/compat/TravelersBackpackCompat.java b/src/main/java/com/b1n_ry/yigd/compat/TravelersBackpackCompat.java index 1ba17822..9c1e052a 100644 --- a/src/main/java/com/b1n_ry/yigd/compat/TravelersBackpackCompat.java +++ b/src/main/java/com/b1n_ry/yigd/compat/TravelersBackpackCompat.java @@ -6,7 +6,6 @@ import com.b1n_ry.yigd.events.DropRuleEvent; import com.b1n_ry.yigd.util.DropRule; import com.tiviacz.travelersbackpack.component.ComponentUtils; -import com.tiviacz.travelersbackpack.component.ITravelersBackpackComponent; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; import net.minecraft.server.network.ServerPlayerEntity; diff --git a/src/main/java/com/b1n_ry/yigd/mixin/WorldRendererMixin.java b/src/main/java/com/b1n_ry/yigd/mixin/WorldRendererMixin.java index 727a74c4..45989d48 100644 --- a/src/main/java/com/b1n_ry/yigd/mixin/WorldRendererMixin.java +++ b/src/main/java/com/b1n_ry/yigd/mixin/WorldRendererMixin.java @@ -14,7 +14,6 @@ public abstract class WorldRendererMixin { * I feel like this is kinda cursed if this is the case, but I don't know how else to do it ¯\_(ツ)_/¯ * Also it seems to work, as long as the rendering on the outline render layer is an actual outline vertex consumer */ - @SuppressWarnings("InvalidInjectorMethodSignature") @ModifyVariable(method = "render", at = @At(value = "CONSTANT", args = "stringValue=blockentities", ordinal = 0), ordinal = 3) private boolean modify(boolean value) { boolean res = value || GraveBlockEntityRenderer.renderOutlineShader;