Update to 1.20.3, lectern support is still disabled

Author: waffle-stomper

build.gradle

@@ -74,12 +74,6 @@ minecraft {
             // You can set various levels here.
             // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
             property 'forge.logging.console.level', 'debug'
-
-            mods {
-                "${mod_id}" {
-                    source sourceSets.main
-                }
-            }
         }
 
         client {
@@ -170,13 +164,12 @@ tasks.named('processResources', ProcessResources).configure {
 tasks.named('jar', Jar).configure {
     manifest {
         attributes([
-                'Specification-Title'     : mod_id,
-                'Specification-Vendor'    : mod_authors,
-                'Specification-Version'   : '1', // We are version 1 of ourselves
-                'Implementation-Title'    : project.name,
-                'Implementation-Version'  : project.jar.archiveVersion,
-                'Implementation-Vendor'   : mod_authors,
-                'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+            'Specification-Title'     : mod_id,
+            'Specification-Vendor'    : mod_authors,
+            'Specification-Version'   : '1', // We are version 1 of ourselves
+            'Implementation-Title'    : project.name,
+            'Implementation-Version'  : project.jar.archiveVersion,
+            'Implementation-Vendor'   : mod_authors
         ])
     }
 
@@ -206,3 +199,20 @@ publishing {
 tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
 }
+
+eclipse {
+    // Run everytime eclipse builds the code
+    //autoBuildTasks genEclipseRuns
+    // Run when importing the project
+    synchronizationTasks 'genEclipseRuns'
+}
+
+// Merge the resources and classes into the same directory. 
+// This is done because java expects modules to be in a single directory.
+// And if we have it in multiple we have to do performance intensive hacks like having the UnionFileSystem
+// This will eventually be migrated to ForgeGradle so modders don't need to manually do it. But that is later.
+sourceSets.each {
+    def dir = layout.buildDirectory.dir("sourcesSets/$it.name")
+    it.output.resourcesDir = dir
+    it.java.destinationDirectory = dir
+}

gradle.properties

@@ -7,17 +7,17 @@ org.gradle.daemon=false
 ## Environment Properties
 
 # The Minecraft version must agree with the Forge version to get a valid artifact
-minecraft_version=1.20.2
+minecraft_version=1.20.3
 # The Minecraft version range can use any release version of Minecraft as bounds.
 # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
 # as they do not follow standard versioning conventions.
-minecraft_version_range=[1.20.2,1.21)
+minecraft_version_range=[1.20.3,1.21)
 # The Forge version must agree with the Minecraft version to get a valid artifact
-forge_version=48.1.0
+forge_version=49.0.2
 # The Forge version range can use any version of Forge as bounds or match the loader version range
-forge_version_range=[48,)
+forge_version_range=[0,)
 # The loader version range can only use the major version of Forge/FML as bounds
-loader_version_range=[48,)
+loader_version_range=[0,)
 # The mapping channel to use for mappings.
 # The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"].
 # Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin.
@@ -35,7 +35,7 @@ loader_version_range=[48,)
 mapping_channel=official
 # The mapping version to query from the mapping channel.
 # This must match the format required by the mapping channel.
-mapping_version=1.20.2
+mapping_version=1.20.3
 
 
 ## Mod Properties
@@ -48,7 +48,7 @@ mod_name=Ghostwriter
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=GNU GPL v3.0
 # The mod version. See https://semver.org/
-mod_version=2.4.7
+mod_version=2.4.8
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/main/java/wafflestomper/ghostwriter/gui/screen/GhostwriterFileBrowserScreen.java

@@ -205,8 +205,9 @@ public void init() {
 		this.children.add(this.fileSelectionList);
 		this.populateFileList();
 
-		// Make sure everything is in place in case the window was resized
-		this.fileSelectionList.updateSize(this.width, this.height, 32, this.height - 64);
+		// Make sure everything is in place in case the window was resized.
+		// Note that ObjectSectionList (superclass of FileSelectionList) no longer has an updateSize()
+		// function so we just skip that call hope it happens automatically
 		this.filenameField.x = this.width / 2 - 125;
 		this.filenameField.y = this.height - BORDER_HEIGHT * 2 - BUTTON_HEIGHT * 2;
 
@@ -276,6 +277,12 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partia
 		else if (this.hoveringText != null) {
 			guiGraphics.renderTooltip(this.font, Component.translatable(this.hoveringText), mouseX, mouseY);
 		}
+
+
+	}
+
+	public void renderBackground(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
+		guiGraphics.fill(0, 0, this.width, this.height, 0xFF000000);
 	}
 
 

src/main/java/wafflestomper/ghostwriter/gui/widget/FileSelectionList.java

@@ -25,7 +25,7 @@ public class FileSelectionList extends ObjectSelectionList<FileSelectionList.Ent
 
 
 	public FileSelectionList(GhostwriterFileBrowserScreen ownerIn, Minecraft mcIn, int widthIn, int heightIn, int topIn, int bottomIn, int slotHeightIn) {
-		super(mcIn, widthIn, heightIn, topIn, bottomIn, slotHeightIn);
+		super(mcIn, widthIn, heightIn, topIn, slotHeightIn);
 		this.owner = ownerIn;
 		this.parentDir = new ParentDirEntry(this.owner);
 	}
@@ -43,8 +43,13 @@ public void updateFileList(List<File> displayFiles) {
 			this.addEntry(n);
 		}
 	}
-	
-	
+
+	// TODO: Figure out how to use this to allow filenames to use the full width available
+//	@Override
+//	public int getRowWidth() {
+//		return super.getRowWidth() + XXX;
+//	}
+
 	@OnlyIn(Dist.CLIENT)
 	public static abstract class Entry extends ObjectSelectionList.Entry<FileSelectionList.Entry> {
 	}
@@ -68,7 +73,7 @@ public void render(GuiGraphics guiGraphics, int p_render_1_, int p_render_2_, in
 						   int mouseX, int mouseY, boolean mouseIsOver, float p_render_9_) {
 			guiGraphics.drawString(this.mc.font, "..", p_render_3_, p_render_2_ + 1, 0x00FF00); // Params are string, x, y, color
 		}
-		
+
 
 		public boolean mouseClicked(double p_mouseClicked_1_, double p_mouseClicked_3_, int p_mouseClicked_5_) {
 			this.owner.setSelectedSlot(this);

src/main/resources/pack.mcmeta

@@ -1,8 +1,6 @@
 {
   "pack": {
-    "description": {
-      "text": "${mod_id} resources"
-    },
-    "pack_format": 18
+    "description": "${mod_id} resources",
+    "pack_format": 22
   }
 }

update.json

@@ -1,6 +1,7 @@
 {
   "homepage": "https://github.com/waffle-stomper/Ghostwriter/releases",
   "promos":{
+    "1.20.3-recommended": "2.4.8",
     "1.20.2-recommended": "2.4.7",
     "1.20.1-recommended": "2.4.6",
     "1.20-recommended": "2.4.5",
@@ -27,8 +28,11 @@
     "1.11-recommended": "1.8.7",
     "1.10-recommended": "1.8.5"
   },
+  "1.20.3": {
+    "2.4.8": "Update to 1.20.3. Lectern support temporarily disabled"
+  },
   "1.20.2": {
-    "2.4.7": "Update to 1.20.1. Lectern support temporarily disabled"
+    "2.4.7": "Update to 1.20.2. Lectern support temporarily disabled"
   },
   "1.20.1": {
     "2.4.6": "Update to 1.20.1. Lectern support temporarily disabled"