From ac5e3919df3ca9e9bf29fe09ed5244dff3e2ddee Mon Sep 17 00:00:00 2001 From: TheBigEye Date: Mon, 7 Sep 2020 06:51:39 -0300 Subject: [PATCH] Update Screen, network and saveload --- src/minicraft/screen/BookData.java | 4 +- src/minicraft/screen/CraftMenu.java | 5 ++ src/minicraft/screen/MapData.java | 75 ++++++++++++++++---------- src/minicraft/screen/MapDisplay.java | 2 +- src/minicraft/screen/Menu.java | 4 ++ src/minicraft/screen/TitleDisplay.java | 19 +++---- 6 files changed, 71 insertions(+), 38 deletions(-) create mode 100644 src/minicraft/screen/CraftMenu.java diff --git a/src/minicraft/screen/BookData.java b/src/minicraft/screen/BookData.java index 2a6411d..fc26ecd 100644 --- a/src/minicraft/screen/BookData.java +++ b/src/minicraft/screen/BookData.java @@ -6,10 +6,12 @@ public class BookData { - public static final String about = "Modded by David.b and +Dillyg10+ until 1.8, then taken over by Chris J until 2.0.4, and then by afyber. Our goal is to expand Minicraft to be more fun and continuous.\nMinicraft was originally made by Markus Perrson for ludum dare 22 competition."; + public static final String about = "Modded by TheBigEye + My goal is to expand Minicraft with this Mod so that you can enjoy another adventure ... have fun and improve both the gameplay and the diversity of objects, mobs, Bosses and biomes.\nMinicraft was originally made by Markus Persson for ludum dare 22 competition."; public static final String instructions = "With the default controls...\n\nMove your character with arrow keys or WSAD. Press C to attack and X to open the inventory, and to use items. Pickup furniture and torches with V. Select an item in the inventory to equip it.\n\nThe Goal: Defeat Cthulhu!"; + public static final String credits = "Thanks to...\n\nShylor !!!, although i never mention me or the mod... thanks to him there is the playminicraft community.. the one that is unique because of the people who make it up... thanks to him the revive minicraft project is up and running like the server discord.. thanks to you this and everything is possible... thanks. i hope you have read this.\n\nAlice for helping me a lot (help me to solve problems, and thanks to her for encouraging me to continue with the development :,) ).\n\nZucc, GC4k, Fusyon and the entire community for giving me ideas and helping me decide each change without affecting the gameplay (ideas and making decisions).\n\nRiverOaken, for making sn epic texture pack, i decided to put you here because you are the owner of Rcraft (the texture pack that you use for the mod), i also made some minor modifications for better details, thanks for making this also possible (Texture pack).\n\nChris and Cristoffer, thanks to you i was able to improve my programming skills and hel me, also without the minicraft plus mod... this would have been possible.. thanks (help and mod base)."; + public static final String antVenomBook = loadBook("antidous"); public static final String storylineGuide = loadBook("story_guide"); diff --git a/src/minicraft/screen/CraftMenu.java b/src/minicraft/screen/CraftMenu.java new file mode 100644 index 0000000..df43b81 --- /dev/null +++ b/src/minicraft/screen/CraftMenu.java @@ -0,0 +1,5 @@ +package minicraft.screen; + +public class CraftMenu { + +} diff --git a/src/minicraft/screen/MapData.java b/src/minicraft/screen/MapData.java index f59f0a7..f35068d 100644 --- a/src/minicraft/screen/MapData.java +++ b/src/minicraft/screen/MapData.java @@ -5,35 +5,56 @@ public enum MapData { - GRASS(Tiles.get("Grass").id, 430), - LAWN(Tiles.get("Lawn").id, 430), - DIRT(Tiles.get("Dirt").id, 540), - FLOWER(Tiles.get("Flower").id, 430), - HOLE(Tiles.get("Hole").id, 430), - WATER(Tiles.get("Water").id, 540), - LAVA(Tiles.get("Lava").id, 5), - ROCK(Tiles.get("Rock").id, 430), - HARD_ROCK(Tiles.get("Hard Rock").id, 430), - TREE(Tiles.get("Tree").id, 430), - SAND(Tiles.get("Sand").id, 430), - SNOW(Tiles.get("Snow").id, 430), + GRASS(Tiles.get("Grass").id, Color.get(1, 58, 198, 30)), + MYCELIUM(Tiles.get("Mycelium").id, Color.get(1, 89, 86, 86)), + LAWN(Tiles.get("Lawn").id, Color.get(1, 57, 191, 30)), + DIRT(Tiles.get("Dirt").id, Color.get(1, 132, 116, 0)), + FLOWER(Tiles.get("Flower").id, Color.YELLOW), + HOLE(Tiles.get("Hole").id, Color.get(1, 61, 47, 8)), + WATER(Tiles.get("Water").id, Color.get(1, 0, 178, 240)), + LAVA(Tiles.get("Lava").id, Color.RED), + ROCK(Tiles.get("Rock").id, Color.get(1, 145, 143, 122)), + HARD_ROCK(Tiles.get("Hard Rock").id, Color.get(1, 127, 126, 107)), + CACTUS(Tiles.get("Cactus").id, Color.GREEN), + TREE(Tiles.get("Tree").id, Color.get(1, 0, 113, 0)), + FIR_TREE(Tiles.get("Fir Tree").id, Color.get(1, 19, 139, 98)), + PINE_TREE(Tiles.get("Pine Tree").id, Color.get(1, 17, 127, 89)), + //GIANT_RED_MUSHROOM(Tiles.get("Giant Red Mushroom").id, Color.get(1, 209, 20, 10)), + //GIANT_BROWN_MUSHROOM(Tiles.get("Giant Brown Mushroom").id, Color.get(1, 175, 122, 96)), + SAND(Tiles.get("Sand").id, Color.get(1, 232, 201, 0)), + SNOW(Tiles.get("Snow").id, Color.get(1, 240, 240, 240)), STAIRS_UP(Tiles.get("Stairs Up").id, 0xffffff), STAIRS_DOWN(Tiles.get("Stairs Down").id, 0xffffff), - WOOD_FLOOR(Tiles.get("Wood Planks").id, 540), - WOOD_WALL(Tiles.get("Wood Wall").id, 430), - WOOD_DOOR(Tiles.get("Wood Door").id, 541), - STONE_FLOOR(Tiles.get("Stone Bricks").id, 430), - STONE_WALL(Tiles.get("Stone Wall").id, 555), - STONE_DOOR(Tiles.get("Stone Door").id, 555), - OBSIDIAN_FLOOR(Tiles.get("Obsidian").id, 203), - OBSIDIAN_WALL(Tiles.get("Obsidian Wall").id, 304), - OBSIDIAN_DOOR(Tiles.get("Obsidian Door").id, 304), - WOOL(Tiles.get("Wool").id, 555), // Yes I know woolColor isn't taken into account - FARMLAND(Tiles.get("Farmland").id, 422), - WHEAT(Tiles.get("Wheat").id, 350), - INFINITE_FALL(Tiles.get("Infinite Fall").id, 540), - CLOUD(Tiles.get("cloud").id, 225), - CLOUD_CACTUS(Tiles.get("Cloud Cactus").id, 255); + WOOD_FLOOR(Tiles.get("Wood Planks").id, Color.get(1, 145, 79, 14)), + WOOD_WALL(Tiles.get("Wood Wall").id, Color.get(1, 122, 67, 12)), + WOOD_DOOR(Tiles.get("Wood Door").id, Color.get(1, 122, 72, 23)), + STONE_FLOOR(Tiles.get("Stone Bricks").id, Color.get(1, 163, 163, 163)), + STONE_WALL(Tiles.get("Stone Wall").id, Color.get(1, 99, 99, 99)), + STONE_DOOR(Tiles.get("Stone Door").id, Color.get(1, 119, 119, 119)), + OBSIDIAN_FLOOR(Tiles.get("Obsidian").id, Color.get(1, 76, 30, 100)), + OBSIDIAN_WALL(Tiles.get("Obsidian Wall").id, Color.get(1, 46, 24, 118)), + OBSIDIAN_DOOR(Tiles.get("Obsidian Door").id, Color.get(1, 44, 21, 67)), + + WOOL(Tiles.get("Wool").id, Color.get(1, 239, 239, 236)), + BLACK_WOOL(Tiles.get("Black Wool").id, Color.get(1, 23, 19, 18)), + YELLOW_WOOL(Tiles.get("Yellow Wool").id, Color.get(1, 186, 175, 49)), + GREEN_WOOL(Tiles.get("Green Wool").id, Color.get(1, 71, 178, 59)), + BLUE_WOOL(Tiles.get("Blue Wool").id, Color.get(1, 51, 75, 160)), + RED_WOOL(Tiles.get("Red Wool").id, Color.get(1, 146, 48, 47)), + PURPLE_WOOL(Tiles.get("Purple Wool").id, Color.get(1, 127, 63, 180)), + PINK_WOOL(Tiles.get("Pink Wool").id, Color.get(1, 224, 175, 198)), + DARK_GREEN_WOOL(Tiles.get("Dark Green Wool").id, Color.get(1, 53, 70, 29)), + BROWN_WOOL(Tiles.get("Brown Wool").id, Color.get(1, 91, 56, 36)), + MAGENTA_WOOL(Tiles.get("Magenta Wool").id, Color.get(1, 184, 87, 194)), + LIGHT_BLUE_WOOL(Tiles.get("Light Blue Wool").id, Color.get(1, 111, 155, 220)), + CYAN_WOOL(Tiles.get("Cyan Wool").id, Color.get(1, 48, 114, 138)), + ORANGE_WOOL(Tiles.get("Orange Wool").id, Color.get(1, 229, 110, 71)), + + FARMLAND(Tiles.get("Farmland").id, Color.get(1, 145, 75, 75)), + WHEAT(Tiles.get("Wheat").id, Color.get(1, 226, 226, 111)), + INFINITE_FALL(Tiles.get("Infinite Fall").id, Color.get(1, 0, 87, 122)), + CLOUD(Tiles.get("cloud").id, Color.WHITE), + CLOUD_CACTUS(Tiles.get("Cloud Cactus").id, Color.GREEN); public int tileID; diff --git a/src/minicraft/screen/MapDisplay.java b/src/minicraft/screen/MapDisplay.java index cbb429f..a7f85f8 100644 --- a/src/minicraft/screen/MapDisplay.java +++ b/src/minicraft/screen/MapDisplay.java @@ -109,7 +109,7 @@ public void render(Screen screen) { } } // by drawing with only one pixel at a time we can draw with much more precision - screen.render(i + menuBounds.getLeft() + 6, c + menuBounds.getTop() + 6, 3 + 16 * 16, Color.get(color, color, color, color), 0); + screen.setPixel(i + menuBounds.getLeft() + 6, c + menuBounds.getTop() + 6, color); } } /*if (arrows[0]) { diff --git a/src/minicraft/screen/Menu.java b/src/minicraft/screen/Menu.java index e1b069e..0fded88 100644 --- a/src/minicraft/screen/Menu.java +++ b/src/minicraft/screen/Menu.java @@ -538,6 +538,10 @@ public Builder copy() { return b; } + public Builder setFrame(int i, int j, int k) { + // TODO Auto-generated method stub + return null; + } } public String toString() { diff --git a/src/minicraft/screen/TitleDisplay.java b/src/minicraft/screen/TitleDisplay.java index 1ea74d9..e063006 100644 --- a/src/minicraft/screen/TitleDisplay.java +++ b/src/minicraft/screen/TitleDisplay.java @@ -48,6 +48,7 @@ public TitleDisplay() { }), new SelectEntry("Multiplayer", () -> Game.setMenu(new MultiplayerDisplay())), new SelectEntry("Options", () -> Game.setMenu(new OptionsDisplay())), + new SelectEntry("Credits", () -> Game.setMenu(new BookDisplay(BookData.credits))), displayFactory("Help", new SelectEntry("Instructions", () -> Game.setMenu(new BookDisplay(BookData.instructions))), new BlankEntry(), @@ -170,21 +171,21 @@ public void render(Screen screen) { "Happy birthday Minicraft!", "Happy XMAS!", "Multiplayer Now Included!", - // "Also play InfinityTale!", - // "Also play Minicraft Deluxe!", - // "Also play Alecraft!", - // "Also play Hackcraft!", - // "Also play MiniCrate!", - // "Also play MiniCraft Mob Overload!", + "Also play InfinityTale!", + "Also play Minicraft Deluxe!", + "Also play Alecraft!", + "Also play Hackcraft!", + "Also play MiniCrate!", + "Also play MiniCraft Mob Overload!", "Now with better fishing!", "Now with better tools!", "Now with better chests!", "Now with better dungeons!", "Only on PlayMinicraft.com!", "Playminicraft.com is the bomb!", - // "@MinicraftPlus on Twitter", + "@MinicraftPlus on Twitter", "MinicraftPlus on Youtube", - //"Join the Forums!", + "Join the Forums!", "The Wiki is weak! Help it!", "Notch is Awesome!", "Dillyg10 is cool as Ice!", @@ -264,7 +265,7 @@ public void render(Screen screen) { "Punch the Moon!", "This is String qq!", "Why?", - //"You are null!", + "You are null!", "hello down there!", "That guy is such a sly fox!", "Hola senor!",