From 74f977f2390647bd7db4e6d69fc2e9a145bfa6fc Mon Sep 17 00:00:00 2001 From: Ben Forge <74168521+BenCheung0422@users.noreply.github.com> Date: Thu, 28 Nov 2024 18:40:42 +0800 Subject: [PATCH 1/8] Fix Russian letter ordering in font.png --- .../resources/assets/textures/gui/font.png | Bin 5540 -> 4865 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/client/resources/assets/textures/gui/font.png b/src/client/resources/assets/textures/gui/font.png index d7e2963a04baeda1516b06e30fb8ec7c199957cf..70ef94702f81d13c717bf98dbfa2e9a5144e8cf0 100644 GIT binary patch literal 4865 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 ti~TQWpHT5XX#D@mX<%h>dR=co?~lCX Date: Wed, 4 Dec 2024 14:52:06 -0600 Subject: [PATCH 2/8] Application Configuration for Gradle Added the "Application" plugin to the client and server projects, which already use it to start their respective programs. Also, makes the client application run by default when executing the 'run' task in the base project. --- build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build.gradle b/build.gradle index e3918b62a..8a4f3989d 100644 --- a/build.gradle +++ b/build.gradle @@ -5,6 +5,7 @@ plugins { allprojects { apply plugin: "java" + apply plugin: "application" version = "2.2.1-dev2" @@ -81,6 +82,11 @@ dependencies { implementation project(":client") } +// Running the root project actually just runs the client project +application { + mainClass = 'minicraft.core.Game' +} + // Build a runnable game distribution. jar { manifest { From 1fe608fc310e6b7ad8267e85e9fb12b8737d6d3e Mon Sep 17 00:00:00 2001 From: Makkkkus <37084190+Makkkkus@users.noreply.github.com> Date: Thu, 5 Dec 2024 23:46:27 +0100 Subject: [PATCH 3/8] Increment version to 2.3.0-dev1 --- ChangeLog.md | 2 +- build.gradle | 2 +- src/client/java/minicraft/core/Game.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 14a3d4f46..afb5749bf 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -7,7 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html), but some sections are changed to compliant this project. -## [2.2.1] +## [2.3.0] ### Additions diff --git a/build.gradle b/build.gradle index e3918b62a..7b0b3fe81 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { allprojects { apply plugin: "java" - version = "2.2.1-dev2" + version = "2.3.0-dev1" sourceCompatibility = 8 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' diff --git a/src/client/java/minicraft/core/Game.java b/src/client/java/minicraft/core/Game.java index 0be9e3420..93c71eefe 100644 --- a/src/client/java/minicraft/core/Game.java +++ b/src/client/java/minicraft/core/Game.java @@ -25,7 +25,7 @@ protected Game() { public static final String NAME = "Minicraft Plus"; // This is the name on the application window. - public static final Version VERSION = new Version("2.2.1-dev2"); + public static final Version VERSION = new Version("2.3.0-dev1"); public static InputHandler input; // Input used in Game, Player, and just about all the *Menu classes. public static Player player; From a2812a79030125a76b2b7bba46d6d4afbb26170e Mon Sep 17 00:00:00 2001 From: Makkkkus <37084190+Makkkkus@users.noreply.github.com> Date: Fri, 6 Dec 2024 00:32:12 +0100 Subject: [PATCH 4/8] Update changelog --- ChangeLog.md | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index afb5749bf..7a57c34dc 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -12,13 +12,20 @@ but some sections are changed to compliant this project. ### Additions * Added ornate wood tiles +* Added dye vat +* Added 16 new flowers +* Added 16 dye colors +* Added 15 bed colors +* Added 10 wool colors +* Added a backup feature whenever using a development build ### Changes * Disabled hardware acceleration by default * Hardware acceleration is now a toggle in settings * Screenshots will now be the size of the rendered view within the window -* Updated localization +* Updated textures of wool items +* Updated textures of wool tiles ### Removals @@ -27,9 +34,22 @@ but some sections are changed to compliant this project. ### Fixes -* Optimized light source rendering -* Optimized calculations -* Fixed the texture on stone hoe + +## [2.2.1] + +### Additions +* Added inventory capacity counter + +### Fixes +* Prevent creepers from blowing up stairs +* Updated localisation +* Fixed Russian font +* Fixed performance issues +* Fixed corner rendering of some tiles +* Fixed overworld rendering as totally black at night +* Fixed some keys not bound to cursor mappings +* Fixed a wrong texture +* Fixed problems with screenshot feature ## [2.2.0] From 90bb104b6174b48d5f8063a579660733b3db32b8 Mon Sep 17 00:00:00 2001 From: Makkkkus <37084190+Makkkkus@users.noreply.github.com> Date: Sat, 7 Dec 2024 00:55:05 +0100 Subject: [PATCH 5/8] Fix loading flower data --- src/client/java/minicraft/saveload/Load.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/client/java/minicraft/saveload/Load.java b/src/client/java/minicraft/saveload/Load.java index ebf995c6a..d9a822a34 100644 --- a/src/client/java/minicraft/saveload/Load.java +++ b/src/client/java/minicraft/saveload/Load.java @@ -755,7 +755,7 @@ private void loadWorld(String filename) { default: tilename = "White Wool"; } - } else if (worldVer.compareTo(new Version("2.2.1-dev2")) < 0) { + } else if (worldVer.compareTo(new Version("2.3.0-dev1")) < 0) { tilename = "White Wool"; } } else if (l == World.minLevelDepth + 1 && tilename.equalsIgnoreCase("Lapis") && worldVer.compareTo(new Version("2.0.3-dev6")) < 0) { @@ -883,7 +883,7 @@ public static void loadTile(Version worldVer, short[] tiles, short[] data, int i data[idx] = Tiles.get(matcher.group(1)).id; } else { tiles[idx] = Tiles.get(tileName).id; - if (worldVer.compareTo(new Version("2.2.1-dev1")) <= 0 && tileName.equalsIgnoreCase("FLOWER")) { + if (worldVer.compareTo(new Version("2.3.0-dev1")) <= 0 && tileName.equalsIgnoreCase("FLOWER")) { data[idx] = 0; } else { data[idx] = Short.parseShort(tileData); @@ -1046,12 +1046,9 @@ protected static String subOldName(String name, Version worldVer) { name = name.replace("Potion", "Awkward Potion"); } - if (worldVer.compareTo(new Version("2.2.1-dev2")) < 0) { + if (worldVer.compareTo(new Version("2.3.0-dev1")) < 0) { if (name.startsWith("Wool")) name = name.replace("Wool", "White Wool"); - } - - if (worldVer.compareTo(new Version("2.2.1-dev2")) < 0) { if (name.startsWith("Flower")) name = name.replace("Flower", "Oxeye Daisy"); } From 51e8567e6aa471cc1245913da9526ec37876e946 Mon Sep 17 00:00:00 2001 From: Makkkkus <37084190+Makkkkus@users.noreply.github.com> Date: Thu, 5 Dec 2024 23:46:27 +0100 Subject: [PATCH 6/8] Increment version to 2.3.0-dev1 --- ChangeLog.md | 2 +- build.gradle | 2 +- src/client/java/minicraft/core/Game.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 14a3d4f46..afb5749bf 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -7,7 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html), but some sections are changed to compliant this project. -## [2.2.1] +## [2.3.0] ### Additions diff --git a/build.gradle b/build.gradle index 8a4f3989d..0550e6788 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ allprojects { apply plugin: "java" apply plugin: "application" - version = "2.2.1-dev2" + version = "2.3.0-dev1" sourceCompatibility = 8 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' diff --git a/src/client/java/minicraft/core/Game.java b/src/client/java/minicraft/core/Game.java index 0be9e3420..93c71eefe 100644 --- a/src/client/java/minicraft/core/Game.java +++ b/src/client/java/minicraft/core/Game.java @@ -25,7 +25,7 @@ protected Game() { public static final String NAME = "Minicraft Plus"; // This is the name on the application window. - public static final Version VERSION = new Version("2.2.1-dev2"); + public static final Version VERSION = new Version("2.3.0-dev1"); public static InputHandler input; // Input used in Game, Player, and just about all the *Menu classes. public static Player player; From 7ea71175821e350fd0d8c17a5018559174106db0 Mon Sep 17 00:00:00 2001 From: Makkkkus <37084190+Makkkkus@users.noreply.github.com> Date: Fri, 6 Dec 2024 00:32:12 +0100 Subject: [PATCH 7/8] Update changelog --- ChangeLog.md | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index afb5749bf..7a57c34dc 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -12,13 +12,20 @@ but some sections are changed to compliant this project. ### Additions * Added ornate wood tiles +* Added dye vat +* Added 16 new flowers +* Added 16 dye colors +* Added 15 bed colors +* Added 10 wool colors +* Added a backup feature whenever using a development build ### Changes * Disabled hardware acceleration by default * Hardware acceleration is now a toggle in settings * Screenshots will now be the size of the rendered view within the window -* Updated localization +* Updated textures of wool items +* Updated textures of wool tiles ### Removals @@ -27,9 +34,22 @@ but some sections are changed to compliant this project. ### Fixes -* Optimized light source rendering -* Optimized calculations -* Fixed the texture on stone hoe + +## [2.2.1] + +### Additions +* Added inventory capacity counter + +### Fixes +* Prevent creepers from blowing up stairs +* Updated localisation +* Fixed Russian font +* Fixed performance issues +* Fixed corner rendering of some tiles +* Fixed overworld rendering as totally black at night +* Fixed some keys not bound to cursor mappings +* Fixed a wrong texture +* Fixed problems with screenshot feature ## [2.2.0] From a2f2c8fdf4befd91485207b2ffc094658dd38644 Mon Sep 17 00:00:00 2001 From: Makkkkus <37084190+Makkkkus@users.noreply.github.com> Date: Sat, 7 Dec 2024 00:55:05 +0100 Subject: [PATCH 8/8] Fix loading flower data --- src/client/java/minicraft/saveload/Load.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/client/java/minicraft/saveload/Load.java b/src/client/java/minicraft/saveload/Load.java index ebf995c6a..d9a822a34 100644 --- a/src/client/java/minicraft/saveload/Load.java +++ b/src/client/java/minicraft/saveload/Load.java @@ -755,7 +755,7 @@ private void loadWorld(String filename) { default: tilename = "White Wool"; } - } else if (worldVer.compareTo(new Version("2.2.1-dev2")) < 0) { + } else if (worldVer.compareTo(new Version("2.3.0-dev1")) < 0) { tilename = "White Wool"; } } else if (l == World.minLevelDepth + 1 && tilename.equalsIgnoreCase("Lapis") && worldVer.compareTo(new Version("2.0.3-dev6")) < 0) { @@ -883,7 +883,7 @@ public static void loadTile(Version worldVer, short[] tiles, short[] data, int i data[idx] = Tiles.get(matcher.group(1)).id; } else { tiles[idx] = Tiles.get(tileName).id; - if (worldVer.compareTo(new Version("2.2.1-dev1")) <= 0 && tileName.equalsIgnoreCase("FLOWER")) { + if (worldVer.compareTo(new Version("2.3.0-dev1")) <= 0 && tileName.equalsIgnoreCase("FLOWER")) { data[idx] = 0; } else { data[idx] = Short.parseShort(tileData); @@ -1046,12 +1046,9 @@ protected static String subOldName(String name, Version worldVer) { name = name.replace("Potion", "Awkward Potion"); } - if (worldVer.compareTo(new Version("2.2.1-dev2")) < 0) { + if (worldVer.compareTo(new Version("2.3.0-dev1")) < 0) { if (name.startsWith("Wool")) name = name.replace("Wool", "White Wool"); - } - - if (worldVer.compareTo(new Version("2.2.1-dev2")) < 0) { if (name.startsWith("Flower")) name = name.replace("Flower", "Oxeye Daisy"); }