From 5da4cc6d742548f544928e7494410d314a85fafb Mon Sep 17 00:00:00 2001 From: Zandgall Date: Wed, 4 Dec 2024 14:52:06 -0600 Subject: [PATCH 1/4] 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 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 2/4] 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 3/4] 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 4/4] 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"); }