Port to Minecraft 1.20.3

Darkhax-Minecraft · Jan 12, 2024 · 3b25237 · 3b25237
1 parent d5885db
commit 3b25237
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 28 deletions.
diff --git a/common/build.gradle b/common/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     compileOnly group: 'net.darkhax.bookshelf', name: "Bookshelf-Common-${project.ext.minecraft_version}", version: project.ext.bookshelf_version
     compileOnly group: 'net.darkhax.runelic', name: "Runelic-Common-${project.ext.minecraft_version}", version: project.ext.runelic_version
     compileOnly group: 'net.darkhax.pigpen', name: "PigPen-Common-${project.ext.minecraft_version}", version: project.ext.pigpen_version
-    compileOnly group: 'mezz.jei', name: "jei-${minecraft_version}-common-api", version: jei_version
+    //compileOnly group: 'mezz.jei', name: "jei-${minecraft_version}-common-api", version: jei_version
 }
 
 processResources {

diff --git a/common/src/main/java/net/darkhax/darkutilities/features/tomes/ItemTomeFont.java b/common/src/main/java/net/darkhax/darkutilities/features/tomes/ItemTomeFont.java
@@ -1,9 +1,12 @@
 package net.darkhax.darkutilities.features.tomes;
 
 import net.darkhax.bookshelf.api.util.TextHelper;
+import net.minecraft.client.gui.screens.inventory.SignEditScreen;
 import net.minecraft.core.BlockPos;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.ComponentContents;
+import net.minecraft.network.chat.contents.PlainTextContents;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.Entity;
@@ -81,7 +84,7 @@ private static UnaryOperator<SignText> applySignFont(ResourceLocation fontId) {
 
                 final Component lineText = text.getMessage(i, false);
 
-                if (lineText.getContents() == ComponentContents.EMPTY) {
+                if (lineText == CommonComponents.EMPTY || lineText.getContents() == PlainTextContents.EMPTY) {
 
                     continue;
                 }

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -12,18 +12,6 @@ base {
     archivesName = "${mod_name}-Fabric-${minecraft_version}"
 }
 
-repositories {
-
-    maven {
-
-        url = 'https://maven.terraformersmc.com/'
-    }
-
-    maven {
-
-        url = 'https://ladysnake.jfrog.io/artifactory/mods'
-    }
-}
 dependencies {
 
     minecraft "com.mojang:minecraft:${minecraft_version}"
@@ -36,7 +24,7 @@ dependencies {
     modImplementation "net.darkhax.bookshelf:Bookshelf-Fabric-${project.ext.minecraft_version}:${project.ext.bookshelf_version}"
     modImplementation "net.darkhax.runelic:Runelic-Fabric-${project.ext.minecraft_version}:${project.ext.runelic_version}"
     modImplementation "net.darkhax.pigpen:PigPen-Fabric-${project.ext.minecraft_version}:${project.ext.pigpen_version}"
-    modImplementation "mezz.jei:jei-${minecraft_version}-fabric:${jei_version}"
+    //modImplementation "mezz.jei:jei-${minecraft_version}-fabric:${jei_version}"
     //modImplementation "dev.emi:trinkets:${project.ext.trinkets_version}"
 
     implementation project(':common')

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -32,7 +32,7 @@
     "fabric": "*",
     "minecraft": "${minecraft_version}",
     "java": ">=17",
-    "bookshelf": ">=21"
+    "bookshelf": ">=22"
   },
   "custom": {
     "modmenu": {

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -72,7 +72,7 @@ dependencies {
     implementation fg.deobf("net.darkhax.runelic:Runelic-Forge-${project.ext.minecraft_version}:${project.ext.runelic_version}")
     implementation fg.deobf("net.darkhax.pigpen:PigPen-Forge-${project.ext.minecraft_version}:${project.ext.pigpen_version}")
     compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:${project.ext.curios_version}")
-    implementation fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}")
+    //implementation fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}")
 
     compileOnly project(':common')
 
@@ -133,6 +133,12 @@ processResources {
 
 jar.finalizedBy('reobfJar')
 
+sourceSets.each {
+    def dir = layout.buildDirectory.dir("sourcesSets/$it.name")
+    it.output.resourcesDir = dir
+    it.java.destinationDirectory = dir
+}
+
 jar {
 
     manifest {

diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -26,7 +26,7 @@ side = "BOTH"
 [[dependencies.${ mod_id }]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.20,)"
+versionRange = "[${minecraft_version}]"
 ordering = "NONE"
 side = "BOTH"
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,26 +1,25 @@
 # Project
-version=17.0
+version=18.0
 group=net.darkhax.darkutilities
 
 # Common
-minecraft_version=1.20.2
-bookshelf_version=21.0.14
+minecraft_version=1.20.3
+bookshelf_version=22.0.1
 bookshelf_version_range=21.0.14,
-runelic_version=19.0.4
-pigpen_version=15.0.2
-jei_version=16.0.0.28
+runelic_version=20.0.1
+pigpen_version=16.0.2
 
 # Forge
-forge_version=48.1.0
+forge_version=49.0.2
 forge_version_range=48,
 curios_version=5.4.7+1.20.1
 
 # NeoForge
-neoforge_version=20.2.88
-neoforge_version_range=20.2,
+neoforge_version=20.3.8-beta
+neoforge_version_range=20.3,
 
 # Fabric
-fabric_version=0.91.3+1.20.2
+fabric_version=0.91.1+1.20.3
 fabric_loader_version=0.15.3
 
 # Mod options