From 9aee88fd00503fd84a986ad574ce1e490cd5eb46 Mon Sep 17 00:00:00 2001 From: MartinSVK12 <37455793+MartinSVK12@users.noreply.github.com> Date: Fri, 29 Dec 2023 18:52:46 +0100 Subject: [PATCH] Update dependencies. --- build.gradle | 5 +++-- gradle.properties | 4 ++-- settings.gradle | 2 ++ .../powersuit/SignalumPowerSuit.java | 2 +- src/main/resources/fabric.mod.json | 12 ++++++------ 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index b35dda99..c46f886a 100644 --- a/build.gradle +++ b/build.gradle @@ -123,14 +123,15 @@ dependencies { implementation project(path: ":catalyst:energy",configuration: "namedElements") implementation project(path: ":catalyst:fluids",configuration: "namedElements") implementation project(path: ":catalyst:multiblocks",configuration: "namedElements") + implementation project(path: ":catalyst:effects",configuration: "namedElements") - modImplementation "DragonFly:dragonfly:1.0.4-7.1" + modImplementation "DragonFly:dragonfly:1.2.0-7.1" modImplementation "BTWaila:btwaila:1.0.6-7.1" implementation "org.slf4j:slf4j-api:1.8.0-beta4" implementation "org.apache.logging.log4j:log4j-slf4j18-impl:2.16.0" - implementation 'com.google.guava:guava:30.0-jre' + implementation 'com.google.guava:guava:33.0.0-jre' implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1' var log4jVersion = "2.20.0" diff --git a/gradle.properties b/gradle.properties index eb53f4de..fa01ff4c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,9 +7,9 @@ bta_version=7.1-pre1a loader_version=0.14.19-babric.3-bta # HalpLibe -halplibe_version=3.0.4 +halplibe_version=3.1.0 # Mod -mod_version=0.2.2 +mod_version=0.2.3 mod_group=sunsetsatellite mod_name=signalindustries diff --git a/settings.gradle b/settings.gradle index bb100d46..98f26464 100644 --- a/settings.gradle +++ b/settings.gradle @@ -24,10 +24,12 @@ include(":catalyst") include(":catalyst:energy") include(":catalyst:fluids") include(":catalyst:multiblocks") +include(":catalyst:effects") include(":catalyst:all") project(":catalyst").projectDir = file("${rootProject.projectDir}/../catalyst") project(":catalyst:energy").projectDir = file("${project(":catalyst").projectDir}/energy") project(":catalyst:fluids").projectDir = file("${project(":catalyst").projectDir}//fluids") project(":catalyst:multiblocks").projectDir = file("${project(":catalyst").projectDir}/multiblocks") +project(":catalyst:effects").projectDir = file("${project(":catalyst").projectDir}/effects") project(":catalyst:all").projectDir = file("${project(":catalyst").projectDir}/all") \ No newline at end of file diff --git a/src/main/java/sunsetsatellite/signalindustries/powersuit/SignalumPowerSuit.java b/src/main/java/sunsetsatellite/signalindustries/powersuit/SignalumPowerSuit.java index 3dd06aca..3bb91c13 100644 --- a/src/main/java/sunsetsatellite/signalindustries/powersuit/SignalumPowerSuit.java +++ b/src/main/java/sunsetsatellite/signalindustries/powersuit/SignalumPowerSuit.java @@ -516,7 +516,7 @@ public void renderOverlay(GuiIngame guiIngame, FontRenderer fontRenderer, ItemEn Color c = new Color().setARGB(mode.getColor()); GL11.glColor4f((float) c.getRed() /255, (float) c.getGreen() /255, (float) c.getBlue() /255, (float) c.getAlpha() /255); //GL11.glColor4b((byte) c.getRed(), (byte) c.getGreen(), (byte) c.getBlue(), (byte) c.getAlpha()); - GL11.glBindTexture(3553, mc.renderEngine.getTexture("/gui/gui.png")); + GL11.glBindTexture(GL11.GL_TEXTURE_2D, mc.renderEngine.getTexture("/gui/gui.png")); int x = width / 2 - 91; int y = 0; drawUtil.drawTexturedModalRect(x, y, 0, 0, 182, 22); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index b2365169..a06f0e6a 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "signalindustries", - "version": "0.2.0", + "version": "${version}", "name": "Signal Industries", "icon": "icon128.png", "description": "Technomagical mod with cool gadgets and machines.", @@ -45,11 +45,11 @@ ], "depends": { "fabricloader": ">=0.13.3", - "catalyst-core": ">=1.0.0", - "catalyst-fluids": ">=1.0.0", + "catalyst-core": ">=1.1.1", + "catalyst-fluids": ">=1.0.1", "catalyst-multiblocks": ">=1.0.0", - "catalyst-energy": ">=1.0.0", - "halplibe": ">=3.0.1", - "dragonfly": ">=1.0.0-7.1" + "catalyst-energy": ">=1.0.2", + "halplibe": ">=3.1.0", + "dragonfly": ">=1.2.0-7.1" } }