Use Wunderlib

This commit is contained in:
Frank 2023-05-17 01:33:19 +02:00
parent 043ecb5446
commit 1cea03c1ca
4 changed files with 24 additions and 11 deletions

View file

@ -18,6 +18,7 @@ archivesBaseName = project.archives_base_name
version = project.mod_version version = project.mod_version
group = project.maven_group group = project.maven_group
def local_bclib = findProject(':BCLib') != null def local_bclib = findProject(':BCLib') != null
def local_wunderlib = findProject(':WunderLib') != null
repositories { repositories {
maven { url "https://maven.dblsaiko.net/" } maven { url "https://maven.dblsaiko.net/" }
@ -89,7 +90,7 @@ dependencies {
if (local_bclib) { if (local_bclib) {
implementation(project(path: ":BCLib", configuration: 'dev')) implementation(project(path: ":BCLib", configuration: 'dev'))
} else { } else {
modImplementation "maven.modrinth:BCLib:${project.bclib_version}" modImplementation "com.github.quiqueck:BCLib:${project.bclib_version}"
} }
modCompileOnly "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}" modCompileOnly "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}"
modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}" modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}"
@ -99,6 +100,11 @@ dependencies {
modCompileOnly "dev.emi:trinkets:${project.trinkets_version}" modCompileOnly "dev.emi:trinkets:${project.trinkets_version}"
modCompileOnly "dev.emi:emi:${emi_version}" modCompileOnly "dev.emi:emi:${emi_version}"
//modRuntimeOnly "dev.emi:emi:${emi_version}" //modRuntimeOnly "dev.emi:emi:${emi_version}"
if (local_wunderlib) {
println "Using local WunderLib"
implementation project(path: ":WunderLib", configuration: 'dev')
}
} }
processResources { processResources {

View file

@ -13,13 +13,13 @@ modrinth_versions=["1.19.4"]
release_channel=beta release_channel=beta
modrinth_id=betterend modrinth_id=betterend
# Mod Properties # Mod Properties
mod_version=3.2.1 mod_version=3.2.2
maven_group=org.betterx.betterend maven_group=org.betterx.betterend
archives_base_name=better-end archives_base_name=better-end
# Dependencies # Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
patchouli_version=1.19-73-FABRIC patchouli_version=1.19-73-FABRIC
bclib_version=2.3.3 bclib_version=features~wunderlib-SNAPSHOT
rei_version=11.0.597 rei_version=11.0.597
emi_version=0.7.3+1.19.4 emi_version=0.7.3+1.19.4
trinkets_version=3.6.0 trinkets_version=3.6.0

View file

@ -18,6 +18,7 @@ def allowLocalLibInConsoleMode = false
//The path were to look for the local BCLib //The path were to look for the local BCLib
def BCLibPath = '../BCLib' def BCLibPath = '../BCLib'
def WunderLibPath = '../WunderLib'
// #### Logic #### // #### Logic ####
@ -28,8 +29,9 @@ def isIDE = properties.containsKey('android.injected.invoked.from.ide')
println "IntelliJ: ${isIDE}" println "IntelliJ: ${isIDE}"
def BCLibFolder = new File( BCLibPath ) def BCLibFolder = new File(BCLibPath)
if( allowLocalLibUse && (isIDE || allowLocalLibInConsoleMode) && BCLibFolder.exists() ) { def WunderLibFolder = new File(WunderLibPath)
if (allowLocalLibUse && (isIDE || allowLocalLibInConsoleMode) && BCLibFolder.exists()) {
println "Using local BCLib from '${BCLibFolder}' in IntelliJ" println "Using local BCLib from '${BCLibFolder}' in IntelliJ"
println "If you do not want to load the local version of BClib" println "If you do not want to load the local version of BClib"
println "either rename the Folder containing BCLib to something" println "either rename the Folder containing BCLib to something"
@ -43,4 +45,8 @@ if( allowLocalLibUse && (isIDE || allowLocalLibInConsoleMode) && BCLibFolder.ex
include ':BCLib' include ':BCLib'
project(":BCLib").projectDir = BCLibFolder project(":BCLib").projectDir = BCLibFolder
project(':BCLib').buildFileName = './bclib-composit.gradle' project(':BCLib').buildFileName = './bclib-composit.gradle'
include ':WunderLib'
project(":WunderLib").projectDir = WunderLibFolder
project(':WunderLib').buildFileName = './wunderlib-composit.gradle'
} }

View file

@ -1,5 +1,7 @@
package org.betterx.betterend.integration.emi; package org.betterx.betterend.integration.emi;
import de.ambertation.wunderlib.ui.layout.components.render.RenderHelper;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.gui.GuiComponent; import net.minecraft.client.gui.GuiComponent;
@ -11,7 +13,6 @@ import dev.emi.emi.api.stack.EmiIngredient;
import dev.emi.emi.api.widget.Bounds; import dev.emi.emi.api.widget.Bounds;
import dev.emi.emi.api.widget.SlotWidget; import dev.emi.emi.api.widget.SlotWidget;
import dev.emi.emi.config.EmiConfig; import dev.emi.emi.config.EmiConfig;
import org.wunder.lib.ui.layout.components.render.RenderHelper;
public class TransparentSlotWidget extends SlotWidget { public class TransparentSlotWidget extends SlotWidget {