Merge branch 'main' into removeArch

Readme.md

@@ -20,6 +20,14 @@ If you want to see a quick demo, check out a video covering the mod here:
 
 ### This branch supports the following versions of Minecraft:
 
+#### 1.20.4, 1.20.3 (Default)
+Fabric: 0.15.1\
+Fabric API: 0.91.2+1.20.4\
+Forge: 49.0.16\
+NeoForge: 20.4.83-beta\
+Parchment: 1.20.2:2023.12.10\
+Modmenu: 9.0.0-pre.1
+
 #### 1.20.2
 Fabric: 0.14.24\
 Fabric API: 0.90.4+1.20.2\
@@ -27,7 +35,7 @@ Forge: 48.0.13\
 Parchment: 1.20.1:2023.09.03\
 Modmenu: 8.0.0
 
-#### 1.20.1, 1.20 (Default)
+#### 1.20.1, 1.20
 Fabric: 0.14.24\
 Fabric API: 0.90.4+1.20.1\
 Forge: 47.2.1\

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java

@@ -66,13 +66,6 @@ public class UpdateModScreen extends DhScreen
 		
 		try
 		{
-			// We cannot get assets from the root of the mod so we use this hack
-			// TODO: Load the icon.png and logo.png in the mod initialise rather than here
-			ResourceLocation logoLocation = new ResourceLocation(ModInfo.ID, "logo.png");
-			Minecraft.getInstance().getTextureManager().register(
-					logoLocation,
-					new DynamicTexture(NativeImage.read(JarUtils.accessFile("logo.png")))
-			);
 			
 			
 			// Logo image
@@ -84,7 +77,7 @@ public class UpdateModScreen extends DhScreen
 					// Offset
 					0, 0,
 					// Some textuary stuff
-					0, logoLocation, 130, 65,
+					0, new ResourceLocation(ModInfo.ID, "logo.png"), 130, 65,
 					// Create the button and tell it where to go
 					// For now it goes to the client option by default
 					(buttonWidget) -> System.out.println("Nice, you found an easter egg :)"), // TODO: Add a proper easter egg to pressing the logo (maybe with confetti)

fabric/src/main/resources/fabric.mod.json

@@ -17,7 +17,7 @@
     },
     
     "license": "LGPL-3",
-    "icon": "icon.png",
+    "icon": "assets/distanthorizons/icon.png",
     
     "accessWidener": "distanthorizons.accesswidener",
     

forge/src/main/resources/META-INF/mods.toml

@@ -12,8 +12,8 @@ issueTrackerURL = "${issues}"
     #//updateJSONURL="https://change.me.example.invalid/updates.json" # A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
     displayURL = "${homepage}"
     description = "${description}" #//mandatory. The description text for the mod
-    logoFile = "logo.png"
-    catalogueImageIcon = "icon.png"
+    logoFile = "assets/distanthorizons/logo.png"
+    catalogueImageIcon = "assets/distanthorizons/icon.png"
     credits = "Massive thanks to: Leonardo, Cola, Ran, CoolGi, and Leetom. For their hard work to bring Distant Horizons to where it is today. - James"
     #// if not set defaults to "false"
     clientSideOnly = "true"

neoforge/src/main/resources/META-INF/mods.toml

@@ -12,8 +12,8 @@ issueTrackerURL = "${issues}"
     #//updateJSONURL="https://change.me.example.invalid/updates.json" # A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
     displayURL = "${homepage}"
     description = "${description}" #//mandatory. The description text for the mod
-    logoFile = "logo.png"
-    catalogueImageIcon = "icon.png"
+    logoFile = "assets/distanthorizons/logo.png"
+    catalogueImageIcon = "assets/distanthorizons/icon.png"
     credits = "Massive thanks to: Leonardo, Cola, Ran, CoolGi, and Leetom. For their hard work to bring Distant Horizons to where it is today. - James"
     #// if not set defaults to "false"
     clientSideOnly = "true"