New Oak tree

Additions: + Replaced the old "Tree" tile with "Oak tree" tile Changes: * Removed unused imports * Corrected potions overlay position * Skeletons can't now shoot while on Creative or Peaceful difficulty * Improved the Path and Ores tiles sprites Bug fixes: - The previous correction related to AlAzif was corrected again
TheBigEye · Aug 28, 2022 · 68dc3b7 · 68dc3b7
1 parent 13a4e90
commit 68dc3b7
Show file tree

Hide file tree

Showing 88 changed files with 419 additions and 285 deletions.
diff --git a/src/main/java/minicraft/core/Game.java b/src/main/java/minicraft/core/Game.java
@@ -1,8 +1,5 @@
 package minicraft.core;
 
-import de.jcm.discordgamesdk.Core;
-import de.jcm.discordgamesdk.CreateParams;
-import de.jcm.discordgamesdk.activity.Activity;
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.GraphicsEnvironment;
@@ -14,10 +11,18 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
+
 import javax.swing.JOptionPane;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 import javax.swing.UIManager;
+
+import org.jetbrains.annotations.Nullable;
+import org.tinylog.Logger;
+
+import de.jcm.discordgamesdk.Core;
+import de.jcm.discordgamesdk.CreateParams;
+import de.jcm.discordgamesdk.activity.Activity;
 import minicraft.core.io.InputHandler;
 import minicraft.core.io.Settings;
 import minicraft.core.io.Sound;
@@ -29,8 +34,6 @@
 import minicraft.screen.Display;
 import minicraft.screen.TitleDisplay;
 import minicraft.util.Info;
-import org.jetbrains.annotations.Nullable;
-import org.tinylog.Logger;
 
 //--------------------------------------------------------------------------------------------------------------------------------------------------
 

diff --git a/src/main/java/minicraft/core/Initializer.java b/src/main/java/minicraft/core/Initializer.java
@@ -1,19 +1,22 @@
 package minicraft.core;
 
-import de.jcm.discordgamesdk.Core;
 import java.awt.BorderLayout;
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
+
 import javax.imageio.ImageIO;
 import javax.swing.JFrame;
 import javax.swing.WindowConstants;
-import minicraft.core.io.FileHandler;
+
 import org.tinylog.Logger;
 
+import de.jcm.discordgamesdk.Core;
+import minicraft.core.io.FileHandler;
+
 /*
 * Make the game window and ticks counter
 */

diff --git a/src/main/java/minicraft/core/Renderer.java b/src/main/java/minicraft/core/Renderer.java
@@ -11,7 +11,11 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Random;
+
 import javax.imageio.ImageIO;
+
+import org.tinylog.Logger;
+
 import minicraft.core.io.Settings;
 import minicraft.entity.furniture.Bed;
 import minicraft.entity.mob.Player;
@@ -35,7 +39,6 @@
 import minicraft.screen.LoadingDisplay;
 import minicraft.screen.RelPos;
 import minicraft.util.Info;
-import org.tinylog.Logger;
 
 /*
 * Make the game display logic
@@ -399,7 +402,7 @@ else if (Updater.scoreTime >= 3600) {
 			int pyy = 0; // the height of the box
 			int pw = 0; // length of message in characters.
 			int ph = 0;
-			int px = (Screen.w - 8) / 3 + pxx;
+			int px = (Screen.w - 8) / 3 + pxx - 8;
 			int py = (Screen.h - 8) / 36 - 130;
 
 			for (int i = 0; i < effects.length; i++) {

diff --git a/src/main/java/minicraft/core/VersionInfo.java b/src/main/java/minicraft/core/VersionInfo.java
@@ -1,8 +1,9 @@
 package minicraft.core;
 
-import minicraft.saveload.Version;
 import org.json.JSONObject;
 
+import minicraft.saveload.Version;
+
 public class VersionInfo {
 
     public final Version version;

diff --git a/src/main/java/minicraft/core/World.java b/src/main/java/minicraft/core/World.java
@@ -1,6 +1,10 @@
 package minicraft.core;
 
 import java.util.Random;
+
+import org.jetbrains.annotations.Nullable;
+import org.tinylog.Logger;
+
 import minicraft.core.io.Settings;
 import minicraft.entity.furniture.Bed;
 import minicraft.entity.mob.Player;
@@ -11,8 +15,6 @@
 import minicraft.screen.PlayerDeathDisplay;
 import minicraft.screen.WorldGenDisplay;
 import minicraft.screen.WorldSelectDisplay;
-import org.jetbrains.annotations.Nullable;
-import org.tinylog.Logger;
 
 public class World extends Game {
 	private World() {}

diff --git a/src/main/java/minicraft/core/io/InputHandler.java b/src/main/java/minicraft/core/io/InputHandler.java
@@ -8,9 +8,11 @@
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map.Entry;
-import minicraft.core.Game;
+
 import org.jetbrains.annotations.Nullable;
 
+import minicraft.core.Game;
+
 public class InputHandler implements KeyListener {
 	/**
 	 * This class handles key presses; this also implements MouseListener... but I

diff --git a/src/main/java/minicraft/core/io/Settings.java b/src/main/java/minicraft/core/io/Settings.java
@@ -4,6 +4,7 @@
 import java.awt.GraphicsEnvironment;
 import java.awt.HeadlessException;
 import java.util.HashMap;
+
 import minicraft.screen.entry.ArrayEntry;
 import minicraft.screen.entry.BooleanEntry;
 import minicraft.screen.entry.RangeEntry;

diff --git a/src/main/java/minicraft/core/io/Sound.java b/src/main/java/minicraft/core/io/Sound.java
@@ -2,14 +2,17 @@
 
 import java.io.IOException;
 import java.net.URL;
+
 import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.Clip;
 import javax.sound.sampled.DataLine;
+import javax.sound.sampled.FloatControl;
 import javax.sound.sampled.Line;
 import javax.sound.sampled.LineEvent;
 import javax.sound.sampled.LineUnavailableException;
 import javax.sound.sampled.UnsupportedAudioFileException;
+
 import org.tinylog.Logger;
 
 public class Sound { // Creates sounds from their respective files
@@ -204,8 +207,28 @@ public void loop(boolean start) {
             clip.stop();
         }
     }
+
+    public void echo(int x) {
+        if (!(boolean) Settings.get("sound") || clip == null) {
+            return;
+        }
+
+        clip.setFramePosition(0);
+        clip.start();
+    }
 
     public void stop() { // This stops the clip
         clip.stop();
     }
+
+    public float getVolume() {
+        FloatControl gainControl = (FloatControl) clip.getControl(FloatControl.Type.MASTER_GAIN);        
+        return (float) Math.pow(10f, gainControl.getValue() / 20f);
+    }
+
+    public void setVolume(float volume) {
+        if (volume < 0f || volume > 1f) throw new IllegalArgumentException("Volume not valid: " + volume);
+        FloatControl gainControl = (FloatControl) clip.getControl(FloatControl.Type.MASTER_GAIN);        
+        gainControl.setValue(20f * (float) Math.log10(volume));
+    }
 }
diff --git a/src/main/java/minicraft/entity/Arrow.java b/src/main/java/minicraft/entity/Arrow.java
@@ -1,6 +1,7 @@
 package minicraft.entity;
 
 import java.util.List;
+
 import minicraft.core.io.Settings;
 import minicraft.entity.mob.Mob;
 import minicraft.entity.mob.Player;

diff --git a/src/main/java/minicraft/entity/Boat.java b/src/main/java/minicraft/entity/Boat.java
@@ -2,6 +2,9 @@
 
 import java.util.List;
 import java.util.Random;
+
+import org.jetbrains.annotations.Nullable;
+
 import minicraft.core.Game;
 import minicraft.core.Updater;
 import minicraft.core.io.Settings;
@@ -14,7 +17,6 @@
 import minicraft.item.BoatItem;
 import minicraft.item.Item;
 import minicraft.item.PowerGloveItem;
-import org.jetbrains.annotations.Nullable;
 
 public class Boat extends Entity {
     private static Sprite boatSprite = new Sprite(1, 30, 2, 2, 0);

diff --git a/src/main/java/minicraft/entity/Entity.java b/src/main/java/minicraft/entity/Entity.java
@@ -3,15 +3,17 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
+
+import org.jetbrains.annotations.Nullable;
+
 import minicraft.core.Game;
-import minicraft.network.Network;
 import minicraft.core.Updater;
 import minicraft.entity.mob.Player;
 import minicraft.gfx.Rectangle;
 import minicraft.gfx.Screen;
 import minicraft.item.Item;
 import minicraft.level.Level;
-import org.jetbrains.annotations.Nullable;
+import minicraft.network.Network;
 
 public abstract class Entity implements Tickable {
 

diff --git a/src/main/java/minicraft/entity/Fireball.java b/src/main/java/minicraft/entity/Fireball.java
@@ -1,6 +1,7 @@
 package minicraft.entity;
 
 import java.util.List;
+
 import minicraft.entity.mob.Mob;
 import minicraft.entity.mob.Player;
 import minicraft.gfx.Color;

diff --git a/src/main/java/minicraft/entity/ItemEntity.java b/src/main/java/minicraft/entity/ItemEntity.java
@@ -1,6 +1,7 @@
 package minicraft.entity;
 
 import java.util.List;
+
 import minicraft.core.io.Settings;
 import minicraft.entity.mob.Player;
 import minicraft.entity.particle.FireParticle;

diff --git a/src/main/java/minicraft/entity/Spark.java b/src/main/java/minicraft/entity/Spark.java
@@ -1,6 +1,7 @@
 package minicraft.entity;
 
 import java.util.List;
+
 import minicraft.core.Game;
 import minicraft.core.io.Settings;
 import minicraft.entity.mob.Mob;
@@ -106,8 +107,8 @@ public void tick() {
 		time++;
 
 		if (type == 1) SparkCloud(2);
-		if (type == 2) SparkRain(4);
-		if (type == 3) SparkSpiralRain(5);
+		if (type == 2) SparkRain(3);
+		if (type == 3) SparkSpiralRain(4);
 
 		if (time >= lifeTime) {
 			remove(); // Remove this from the world

diff --git a/src/main/java/minicraft/entity/XpOrb.java b/src/main/java/minicraft/entity/XpOrb.java
@@ -48,14 +48,10 @@ private void goToOwner() {
 		int yd = (int) (player.y - y + Math.toRadians(xp));
 
 		int sig0 = 1;
-		if (xd < sig0)
-			xa = -0.2;
-		if (xd > sig0)
-			xa = +0.2;
-		if (yd < sig0)
-			ya = -0.2;
-		if (yd > sig0)
-			ya = +0.2;
+		if (xd < sig0) xa = -0.2;
+		if (xd > sig0) xa = +0.2;
+		if (yd < sig0) ya = -0.2;
+		if (yd > sig0) ya = +0.2;
 
 		if (random.nextInt(4) == 4) {
 			xa += 0.1;
@@ -82,6 +78,7 @@ public void tick() {
 			remove(); // Remove this from the world
 			return;
 		}
+
 		if (level != null && level.getTile(x >> 4, y >> 4) == Tiles.get("lava")) {
 			remove();
 		}

diff --git a/src/main/java/minicraft/entity/furniture/Chest.java b/src/main/java/minicraft/entity/furniture/Chest.java
@@ -2,6 +2,9 @@
 
 import java.io.IOException;
 import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
+
 import minicraft.core.Game;
 import minicraft.entity.Direction;
 import minicraft.entity.ItemHolder;
@@ -12,7 +15,6 @@
 import minicraft.item.Items;
 import minicraft.saveload.Load;
 import minicraft.screen.ContainerDisplay;
-import org.jetbrains.annotations.Nullable;
 
 public class Chest extends Furniture implements ItemHolder {
     private Inventory inventory; // Inventory of the chest

diff --git a/src/main/java/minicraft/entity/furniture/Crafter.java b/src/main/java/minicraft/entity/furniture/Crafter.java
@@ -1,6 +1,7 @@
 package minicraft.entity.furniture;
 
 import java.util.ArrayList;
+
 import minicraft.core.Game;
 import minicraft.entity.mob.Player;
 import minicraft.gfx.Sprite;

diff --git a/src/main/java/minicraft/entity/furniture/Furniture.java b/src/main/java/minicraft/entity/furniture/Furniture.java
@@ -1,5 +1,7 @@
 package minicraft.entity.furniture;
 
+import org.jetbrains.annotations.Nullable;
+
 import minicraft.core.Game;
 import minicraft.core.io.Sound;
 import minicraft.entity.Direction;
@@ -13,8 +15,6 @@
 import minicraft.item.PowerGloveItem;
 import minicraft.level.tile.Tiles;
 
-import org.jetbrains.annotations.Nullable;
-
 /**
  * Many furniture classes are very similar; they might not even need to be there
  * at all...

diff --git a/src/main/java/minicraft/entity/furniture/Lantern.java b/src/main/java/minicraft/entity/furniture/Lantern.java
@@ -1,6 +1,7 @@
 package minicraft.entity.furniture;
 
 import java.util.Random;
+
 import minicraft.core.io.Settings;
 import minicraft.entity.particle.BrightParticle;
 import minicraft.gfx.Sprite;

diff --git a/src/main/java/minicraft/entity/furniture/Spawner.java b/src/main/java/minicraft/entity/furniture/Spawner.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.Random;
+
 import minicraft.core.Game;
 import minicraft.core.io.Settings;
 import minicraft.core.io.Sound;

diff --git a/src/main/java/minicraft/entity/furniture/Tnt.java b/src/main/java/minicraft/entity/furniture/Tnt.java
@@ -85,7 +85,7 @@ public void tick() {
 
 						if (!tnt.fuseLit) {
 							tnt.fuseLit = true;
-							Sound.Furniture_tnt_fuse.play();
+							Sound.Furniture_tnt_fuse.echo(x);
 							tnt.ftik = FUSE_TIME * 2 / 3;
 						}
 
@@ -108,12 +108,12 @@ public void tick() {
 
 				// Random explode sound
 				switch (random.nextInt(4)) {
-					case 0: Sound.Furniture_tnt_explode.play(); break;
-					case 1: Sound.Furniture_tnt_explode.play(); break;
-					case 2: Sound.Furniture_tnt_explode_2.play(); break;
-					case 3: Sound.Furniture_tnt_explode_3.play(); break;
-					case 4: Sound.Furniture_tnt_explode_4.play(); break;
-					default: Sound.Furniture_tnt_explode.play(); break;
+					case 0: Sound.Furniture_tnt_explode.echo(x); break;
+					case 1: Sound.Furniture_tnt_explode.echo(x); break;
+					case 2: Sound.Furniture_tnt_explode_2.echo(x); break;
+					case 3: Sound.Furniture_tnt_explode_3.echo(x); break;
+					case 4: Sound.Furniture_tnt_explode_4.echo(x); break;
+					default: Sound.Furniture_tnt_explode.echo(x); break;
 				}
 
 				level.setAreaTiles(xt, yt, 1, Tiles.get("explode"), 0, explosionBlacklist);

diff --git a/src/main/java/minicraft/entity/mob/Cat.java b/src/main/java/minicraft/entity/mob/Cat.java
@@ -1,6 +1,7 @@
 package minicraft.entity.mob;
 
 import java.util.Random;
+
 import minicraft.core.io.Settings;
 import minicraft.entity.particle.HeartParticle;
 import minicraft.gfx.MobSprite;