Merge branch 'main' into lokalise

ChangeLog.md

@@ -7,18 +7,25 @@ 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
 
 * 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]
 

build.gradle

@@ -5,8 +5,9 @@ plugins {
 
 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'
@@ -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 {

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;

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");
 		}