Webclient: Start using placeholder text for mobile on-screen keyboard in a few places

Also bump copyright to 2021
This commit is contained in:
UnknownShadow200 2021-01-08 23:39:33 +11:00
parent 3ff7bfe609
commit a485f4c6af
65 changed files with 67 additions and 64 deletions

View File

@ -1,7 +1,7 @@
#ifndef CC_ANIMATIONS_H
#define CC_ANIMATIONS_H
/* Contains everything relating to texture animations (including default water/lava ones)
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct IGameComponent;

View File

@ -2,7 +2,7 @@
#define CC_AUDIO_H
#include "Core.h"
/* Manages playing sound and music.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct IGameComponent;
extern struct IGameComponent Audio_Component;

View File

@ -2,7 +2,7 @@
#define CC_AXISLINESRENDERER_H
#include "Core.h"
/* Renders 3 lines showing direction of each axis.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct IGameComponent;

View File

@ -2,7 +2,7 @@
#define CC_BITMAP_H
#include "Core.h"
/* Represents a 2D array of pixels.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct Stream;

View File

@ -6,7 +6,7 @@
#include "BlockID.h"
/* Stores properties and data for blocks.
Also performs automatic rotation of directional blocks.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct IGameComponent;
extern struct IGameComponent Blocks_Component;

View File

@ -2,7 +2,7 @@
#define CC_BLOCKID_H
#include "Core.h" /* TODO: Remove this include when we move to external defines */
/* List of all core/standard block IDs
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
enum BLOCKID {

View File

@ -2,7 +2,7 @@
#define CC_BLOCKPHYSICS_H
#include "Core.h"
/* Implements simple block physics.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
typedef void (*PhysicsHandler)(int index, BlockID block);

View File

@ -6,7 +6,7 @@ NormalMeshBuilder:
Implements a simple chunk mesh builder, where each block face is a single colour.
(whatever lighting engine returns as light colour for given block face at given coordinates)
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct ChunkInfo;
struct IGameComponent;

View File

@ -3,7 +3,7 @@
#include "Vectors.h"
/* Represents a camera, may be first or third person.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct RayTracer;
struct Camera;

View File

@ -2,7 +2,7 @@
#define CC_CHAT_H
#include "Core.h"
/* Manages sending, adding, logging and handling chat.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct IGameComponent;
struct StringsBuffer;

View File

@ -1,7 +1,7 @@
#ifndef CC_CONSTANTS_H
#define CC_CONSTANTS_H
/* Defines useful constants.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
#define GAME_MAX_CMDARGS 5

View File

@ -1,7 +1,7 @@
#ifndef CC_CORE_H
#define CC_CORE_H
/* Core fixed-size integer types, automatic platform detection, and common small structs.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
#if _MSC_VER

View File

@ -8,7 +8,7 @@
https://www.ietf.org/rfc/rfc1951.txt
https://github.com/nothings/stb/blob/master/stb_image.h
https://www.hanshq.net/zip.html
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct Stream;

View File

@ -3,7 +3,7 @@
#include "PackedCol.h"
#include "Vectors.h"
/* Draws the vertices for a cuboid region.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct VertexTextured;

View File

@ -4,7 +4,7 @@
#include "Constants.h"
#include "Bitmap.h"
/* Performs a variety of drawing operations on bitmaps, and converts bitmaps into textures.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
enum FONT_FLAGS { FONT_FLAGS_NONE = 0x00, FONT_FLAGS_BOLD = 0x01, FONT_FLAGS_UNDERLINE = 0x02, FONT_FLAGS_PADDING = 0x04 };

View File

@ -6,7 +6,7 @@
#include "PackedCol.h"
#include "String.h"
/* Represents an in-game entity.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct Model;
struct IGameComponent;

View File

@ -3,7 +3,7 @@
#include "Vectors.h"
#include "Constants.h"
/* Various components for entities.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct Entity;

View File

@ -2,7 +2,7 @@
#define CC_ENVRENDERER_H
#include "Core.h"
/* Renders environment of the map. (clouds, sky, fog, map sides/edges, skybox, rain/snow)
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct IGameComponent;
extern struct IGameComponent EnvRenderer_Component;

View File

@ -1,7 +1,7 @@
#ifndef CC_ERRORS_H
#define CC_ERRORS_H
/* Represents list of internal errors.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
/* NOTE: When changing these, remember to keep Logger.c up to date! */

View File

@ -2,7 +2,7 @@
#define CC_EVENT_H
#include "Vectors.h"
/* Helper methods for using events, and contains all events.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
/* Max callbacks that can be registered for an event. */

View File

@ -3,7 +3,7 @@
#include "Core.h"
/* Simple math functions and constants. Also implements a RNG algorithm, based on
Java's implementation from https://docs.oracle.com/javase/7/docs/api/java/util/Random.html
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
#define MATH_PI 3.1415926535897931f

View File

@ -2,7 +2,7 @@
#define CC_MAPFORMATS_H
#include "Core.h"
/* Imports/exports a world and associated metadata from/to a particular map file format.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct Stream;

View File

@ -3,7 +3,7 @@
#include "Core.h"
/* Simple function implementations
NOTE: doing min(x++, y) etc will increment x twice!
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
#define min(x, y) ((x) < (y) ? (x) : (y))

View File

@ -2,7 +2,7 @@
#define CC_GAME_H
#include "Core.h"
/* Represents the game and related structures.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct Bitmap;

View File

@ -5,7 +5,7 @@
/* Implements flatgrass map generator, and original classic vanilla map generation (with perlin noise)
Based on: https://github.com/UnknownShadow200/ClassiCube/wiki/Minecraft-Classic-map-generation-algorithm
Thanks to Jerralish for originally reverse engineering classic's algorithm, then preparing a high level overview of the algorithm.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
extern volatile float Gen_CurrentProgress;

View File

@ -4,7 +4,7 @@
#include "PackedCol.h"
/* Abstracts a 3D graphics rendering API.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct Bitmap;
struct Stream;

View File

@ -2,7 +2,7 @@
#define CC_GUI_H
#include "Core.h"
/* Describes and manages 2D GUI elements on screen.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
enum GuiAnchor {

View File

@ -2,7 +2,7 @@
#define CC_HELDBLOCKRENDERER_H
#include "Core.h"
/* Implements rendering of held block/arm at bottom right of game.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct IGameComponent;
extern struct IGameComponent HeldBlockRenderer_Component;

View File

@ -4,7 +4,7 @@
#include "Core.h"
/* Aysnchronously performs http GET, HEAD, and POST requests.
Typically this is used to download skins, texture packs, etc.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct IGameComponent;
struct ScheduledTask;

View File

@ -3,7 +3,7 @@
#include "Core.h"
/* Manages keyboard, mouse, and touch state.
Raises events when keys are pressed etc, and implements base handlers for them.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct IGameComponent;
struct StringsBuffer;

View File

@ -4,7 +4,7 @@
#include "BlockID.h"
/* Manages inventory hotbar, and ordering of blocks in the inventory menu.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct IGameComponent;
extern struct IGameComponent Inventory_Component;

View File

@ -2,7 +2,7 @@
#define CC_ISOMETRICDRAWER_H
#include "Core.h"
/* Draws 2D isometric blocks for the hotbar and inventory UIs.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct VertexTextured;

View File

@ -2,7 +2,7 @@
#define CC_LSCREENS_H
#include "Core.h"
/* Implements screens/menus for the launcher.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct LWidget;
struct LScreen;

View File

@ -2,7 +2,7 @@
#define CC_LWEB_H
#include "Http.h"
/* Implements asynchronous web tasks for the launcher.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct JsonContext;

View File

@ -3,7 +3,7 @@
#include "Bitmap.h"
#include "Constants.h"
/* Describes and manages individual 2D GUI elements in the launcher.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct LScreen;
struct FontDesc;

View File

@ -2,7 +2,7 @@
#define CC_LAUNCHER_H
#include "Bitmap.h"
/* Implements the launcher part of the game.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct LScreen;
struct FontDesc;

View File

@ -3,7 +3,7 @@
#include "PackedCol.h"
/* Manages lighting of blocks in the world.
BasicLighting: Uses a simple heightmap, where each block is either in sun or shadow.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct IGameComponent;
extern struct IGameComponent Lighting_Component;

View File

@ -2,7 +2,7 @@
#define CC_LOGGER_H
#include "Core.h"
/* Support methods for logging errors.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
typedef cc_bool (*Logger_DescribeError)(cc_result res, cc_string* dst);

View File

@ -5,7 +5,7 @@
/* Renders the blocks of the world by subdividing it into chunks.
Also manages the process of building/deleting chunk meshes.
Also sorts chunks so nearest chunks are rendered first, and calculates chunk visibility.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct IGameComponent;
extern struct IGameComponent MapRenderer_Component;

View File

@ -972,7 +972,9 @@ static void EditHotkeyScreen_Init(void* screen) {
TextInputWidget_Create(&s->input, 500, &text, &desc);
Menu_InitBack(&s->cancel, Menu_SwitchHotkeys);
OpenKeyboardArgs_Init(&args, &text, KEYBOARD_TYPE_TEXT);
args.placeholder = "Hotkey text";
Window_OpenKeyboard(&args);
}
@ -1535,7 +1537,9 @@ static void SaveLevelScreen_Init(void* screen) {
Menu_InitBack(&s->cancel, Menu_SwitchPause);
TextInputWidget_Create(&s->input, 500, &String_Empty, &desc);
TextWidget_Init(&s->desc);
OpenKeyboardArgs_Init(&args, &String_Empty, KEYBOARD_TYPE_TEXT);
args.placeholder = "Map name";
Window_OpenKeyboard(&args);
}

View File

@ -3,7 +3,7 @@
#include "Core.h"
/* Contains all 2D menu screen implementations.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct Screen;
int Menu_PointerDown(void* screen, int id, int x, int y);

View File

@ -6,7 +6,7 @@
#include "Physics.h"
/* Contains various structs and methods for an entity model.
Also contains a list of models and default textures for those models.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct Entity;
struct AABB;

View File

@ -2,7 +2,7 @@
#define CC_OPTIONS_H
#include "Core.h"
/* Manages loading and saving options.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
#define OPT_USE_MUSIC "usemusic"

View File

@ -2,7 +2,7 @@
#define CC_PACKEDCOL_H
#include "Core.h"
/* Manipulates a packed 32 bit RGBA colour, in a format suitable for the native 3D graphics API.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
typedef cc_uint32 PackedCol;

View File

@ -3,7 +3,7 @@
#include "Vectors.h"
#include "PackedCol.h"
/* Represents particle effects, and manages rendering and spawning particles.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct IGameComponent;

View File

@ -5,7 +5,7 @@
- An axis aligned bounding box, and various methods related to them.
- Various methods for intersecting geometry.
- Calculates all possible blocks that a moving entity can intersect with.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct Entity;

View File

@ -2,7 +2,7 @@
#define CC_PICKEDPOSRENDERER_H
#include "Core.h"
/* Renders an outline around the block the player is looking at.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct RayTracer;
struct IGameComponent;

View File

@ -2,7 +2,7 @@
#define CC_PICKING_H
#include "Vectors.h"
/* Data for picking/selecting block by the user, and clipping the camera.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
/* Implements a voxel ray tracer

View File

@ -918,8 +918,6 @@ cc_result Socket_Connect(cc_socket s, const cc_string* ip, int port) {
Stream_SetU16_BE( (cc_uint8*)&addr.sa_data[0], port);
Utils_ParseIP(ip, (cc_uint8*)&addr.sa_data[2]);
WSAStringToAddress()
res = connect(s, &addr, sizeof(addr));
return res == -1 ? Socket__Error() : 0;
}

View File

@ -2,7 +2,7 @@
#define CC_PLATFORM_H
#include "Core.h"
/* Abstracts platform specific memory management, I/O, etc.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct DateTime;

View File

@ -2,7 +2,7 @@
#define CC_PROTOCOL_H
#include "Vectors.h"
/* Implements network protocols for original classic, CPE, and WoM textures.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct RayTracer;

View File

@ -2,7 +2,7 @@
#define CC_RESOURCES_H
#include "Core.h"
/* Implements checking, fetching, and patching the default game assets.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
/* Number of resources that need to be downloaded. */

View File

@ -1313,6 +1313,7 @@ void ChatScreen_OpenInput(const cc_string* text) {
Gui_UpdateInputGrab();
OpenKeyboardArgs_Init(&args, text, KEYBOARD_TYPE_TEXT);
args.placeholder = "Enter chat";
Window_OpenKeyboard(&args);
String_Copy(&s->input.base.text, text);

View File

@ -2,7 +2,7 @@
#define CC_SCREENS_H
#include "Core.h"
/* Contains all 2D non-menu screen implementations.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct Screen;

View File

@ -3,7 +3,7 @@
#include "Vectors.h"
#include "PackedCol.h"
/* Describes a selection box, and contains methods related to the selection box.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct IGameComponent;
extern struct IGameComponent Selections_Component;

View File

@ -2,7 +2,7 @@
#define CC_SERVERCONNECTION_H
#include "Vectors.h"
/* Represents a connection to either a multiplayer or an internal singleplayer server.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct IGameComponent;

View File

@ -4,7 +4,7 @@
#include "Platform.h"
/* Defines an abstract way of reading and writing data in a streaming manner.
Also provides common helper methods for reading/writing data to/from streams.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct Stream;

View File

@ -5,7 +5,7 @@
Also implements conversions betweens strings and numbers.
Also implements converting code page 437 indices to/from unicode.
Also implements wrapping a single line of text into multiple lines.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
#define STRING_INT_CHARS 24

View File

@ -5,7 +5,7 @@
- Extracting the textures from a .zip archive
- Caching terrain atlases and texture packs to avoid redundant downloads
- Terrain atlas (including breaking it down into multiple 1D atlases)
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct Stream;

View File

@ -2,7 +2,7 @@
#define CC_UTILS_H
#include "Core.h"
/* Implements various utility functions.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct Bitmap;

View File

@ -4,7 +4,7 @@
#include "Constants.h"
/* Represents 2 and 3 component vectors, and 4 x 4 matrix.
Frustum culling sourced from http://www.crownandcutlass.com/features/technicaldetails/frustum.html
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
/* 2 component vector (2D vector) */

View File

@ -2,7 +2,7 @@
#define CC_VORBIS_H
#include "Core.h"
/* Decodes ogg vorbis audio
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct Stream;
#define VORBIS_MAX_CHANS 8

View File

@ -5,7 +5,7 @@
#include "Constants.h"
#include "Entity.h"
/* Contains all 2D widget implementations.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct FontDesc;

View File

@ -2,7 +2,7 @@
#define CC_WINDOW_H
#include "Core.h"
/* Abstracts creating and managing the native window.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3 | Based on OpenTK code
Copyright 2014-2021 ClassiCube | Licensed under BSD-3 | Based on OpenTK code
*/
/*

View File

@ -4,7 +4,7 @@
#include "PackedCol.h"
/* Represents a fixed size 3D array of blocks.
Also contains associated environment metadata.
Copyright 2014-2020 ClassiCube | Licensed under BSD-3
Copyright 2014-2021 ClassiCube | Licensed under BSD-3
*/
struct AABB;