diff --git a/license.txt b/license.txt index b27d9e3b8..2f824b6d8 100644 --- a/license.txt +++ b/license.txt @@ -1,4 +1,4 @@ -Copyright (c) 2014 - 2021, UnknownShadow200 +Copyright (c) 2014 - 2022, UnknownShadow200 All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/src/Audio.h b/src/Audio.h index ddef17150..bd8a8f1f0 100644 --- a/src/Audio.h +++ b/src/Audio.h @@ -2,7 +2,7 @@ #define CC_AUDIO_H #include "Core.h" /* Manages playing sound and music. - Copyright 2014-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ struct IGameComponent; extern struct IGameComponent Audio_Component; diff --git a/src/AxisLinesRenderer.h b/src/AxisLinesRenderer.h index 66b5b78b9..2f42b520c 100644 --- a/src/AxisLinesRenderer.h +++ b/src/AxisLinesRenderer.h @@ -2,7 +2,7 @@ #define CC_AXISLINESRENDERER_H #include "Core.h" /* Renders 3 lines showing direction of each axis. - Copyright 2014-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ struct IGameComponent; diff --git a/src/Bitmap.h b/src/Bitmap.h index d072f43b1..3a609b410 100644 --- a/src/Bitmap.h +++ b/src/Bitmap.h @@ -2,7 +2,7 @@ #define CC_BITMAP_H #include "Core.h" /* Represents a 2D array of pixels. - Copyright 2014-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ struct Stream; diff --git a/src/Block.h b/src/Block.h index d30316d70..41fb52999 100644 --- a/src/Block.h +++ b/src/Block.h @@ -6,7 +6,7 @@ #include "BlockID.h" /* Stores properties and data for blocks. Also performs automatic rotation of directional blocks. - Copyright 2014-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ struct IGameComponent; extern struct IGameComponent Blocks_Component; diff --git a/src/BlockID.h b/src/BlockID.h index 9d81cfec1..63498da34 100644 --- a/src/BlockID.h +++ b/src/BlockID.h @@ -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-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ enum BLOCKID { diff --git a/src/BlockPhysics.h b/src/BlockPhysics.h index 0e749ab5f..f1e1aa042 100644 --- a/src/BlockPhysics.h +++ b/src/BlockPhysics.h @@ -2,7 +2,7 @@ #define CC_BLOCKPHYSICS_H #include "Core.h" /* Implements simple block physics. - Copyright 2014-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ typedef void (*PhysicsHandler)(int index, BlockID block); diff --git a/src/Chat.h b/src/Chat.h index e336ebecc..a44c5c13b 100644 --- a/src/Chat.h +++ b/src/Chat.h @@ -2,7 +2,7 @@ #define CC_CHAT_H #include "Core.h" /* Manages sending, adding, logging and handling chat. - Copyright 2014-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ struct IGameComponent; struct StringsBuffer; diff --git a/src/Deflate.h b/src/Deflate.h index 4aef10b55..7a8fa9309 100644 --- a/src/Deflate.h +++ b/src/Deflate.h @@ -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-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ struct Stream; diff --git a/src/Drawer2D.h b/src/Drawer2D.h index 9232baca9..6e3171e3a 100644 --- a/src/Drawer2D.h +++ b/src/Drawer2D.h @@ -3,7 +3,7 @@ #include "Bitmap.h" #include "Constants.h" /* Performs a variety of drawing operations on bitmaps, and converts bitmaps into textures. - Copyright 2014-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ enum FONT_FLAGS { FONT_FLAGS_NONE = 0x00, FONT_FLAGS_BOLD = 0x01, FONT_FLAGS_UNDERLINE = 0x02, FONT_FLAGS_PADDING = 0x04 }; diff --git a/src/Entity.h b/src/Entity.h index 63c3d92ac..f636b7b3c 100644 --- a/src/Entity.h +++ b/src/Entity.h @@ -6,7 +6,7 @@ #include "PackedCol.h" #include "String.h" /* Represents an in-game entity. - Copyright 2014-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ struct Model; struct IGameComponent; diff --git a/src/EntityComponents.h b/src/EntityComponents.h index abf915ee1..b719ac8b8 100644 --- a/src/EntityComponents.h +++ b/src/EntityComponents.h @@ -3,7 +3,7 @@ #include "Vectors.h" #include "Constants.h" /* Various components for entities. - Copyright 2014-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ struct Entity; diff --git a/src/Event.h b/src/Event.h index ca7ab5fe5..075cff327 100644 --- a/src/Event.h +++ b/src/Event.h @@ -2,7 +2,7 @@ #define CC_EVENT_H #include "Vectors.h" /* Helper methods for using events, and contains all events. - Copyright 2014-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ /* Max callbacks that can be registered for an event. */ diff --git a/src/ExtMath.h b/src/ExtMath.h index b0bc94f15..84fe63974 100644 --- a/src/ExtMath.h +++ b/src/ExtMath.h @@ -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-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ #define MATH_PI 3.1415926535897931f diff --git a/src/Formats.h b/src/Formats.h index d47771e32..db68932f6 100644 --- a/src/Formats.h +++ b/src/Formats.h @@ -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-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ struct Stream; diff --git a/src/Game.h b/src/Game.h index 52aede525..c55dcc958 100644 --- a/src/Game.h +++ b/src/Game.h @@ -2,7 +2,7 @@ #define CC_GAME_H #include "Core.h" /* Represents the game and related structures. - Copyright 2014-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ struct Bitmap; diff --git a/src/Generator.h b/src/Generator.h index 2c2a741ad..9e7a63b7c 100644 --- a/src/Generator.h +++ b/src/Generator.h @@ -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-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ /* Progress between 0 and 1 for the current step */ diff --git a/src/Graphics.h b/src/Graphics.h index 5329572c0..8c80df097 100644 --- a/src/Graphics.h +++ b/src/Graphics.h @@ -4,7 +4,7 @@ #include "PackedCol.h" /* Abstracts a 3D graphics rendering API -Copyright 2014-2021 ClassiCube | Licensed under BSD-3 +Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ struct Bitmap; struct Stream; diff --git a/src/Gui.h b/src/Gui.h index 43083c95a..d38ae91bc 100644 --- a/src/Gui.h +++ b/src/Gui.h @@ -2,7 +2,7 @@ #define CC_GUI_H #include "Core.h" /* Describes and manages 2D GUI elements on screen. - Copyright 2014-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ enum GuiAnchor { diff --git a/src/Inventory.h b/src/Inventory.h index 16f606266..5a57d6f2e 100644 --- a/src/Inventory.h +++ b/src/Inventory.h @@ -4,7 +4,7 @@ #include "BlockID.h" /* Manages inventory hotbar, and ordering of blocks in the inventory menu. - Copyright 2014-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ struct IGameComponent; extern struct IGameComponent Inventory_Component; diff --git a/src/IsometricDrawer.h b/src/IsometricDrawer.h index 4cc3d9d94..c3cba75a9 100644 --- a/src/IsometricDrawer.h +++ b/src/IsometricDrawer.h @@ -2,7 +2,7 @@ #define CC_ISOMETRICDRAWER_H #include "Core.h" /* Draws 2D isometric blocks for the hotbar and inventory UIs. - Copyright 2014-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ struct VertexTextured; diff --git a/src/LWeb.h b/src/LWeb.h index e8ed8374d..4ed4720af 100644 --- a/src/LWeb.h +++ b/src/LWeb.h @@ -3,7 +3,7 @@ #include "Bitmap.h" #include "Constants.h" /* Implements asynchronous web tasks for the launcher. - Copyright 2014-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ struct JsonContext; diff --git a/src/LWidgets.h b/src/LWidgets.h index 12b2c8210..fe9deba8e 100644 --- a/src/LWidgets.h +++ b/src/LWidgets.h @@ -3,7 +3,7 @@ #include "Bitmap.h" #include "Constants.h" /* Describes and manages individual 2D GUI elements in the launcher. - Copyright 2014-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ struct FontDesc; struct Context2D; diff --git a/src/Launcher.h b/src/Launcher.h index 4424d5e8c..5bb7cecf0 100644 --- a/src/Launcher.h +++ b/src/Launcher.h @@ -2,7 +2,7 @@ #define CC_LAUNCHER_H #include "Bitmap.h" /* Implements the launcher part of the game. - Copyright 2014-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ struct LScreen; struct FontDesc; diff --git a/src/Makefile b/src/Makefile index ceea075fd..53a8fd035 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,8 +3,6 @@ C_OBJECTS:=$(patsubst %.c, %.o, $(C_SOURCES)) OBJECTS:=$(C_OBJECTS) ENAME=ClassiCube DEL=rm -JOBS=1 -CC=cc CFLAGS=-g -pipe -fno-math-errno LDFLAGS=-g -rdynamic @@ -44,7 +42,6 @@ LIBS=-lX11 -lXi -lpthread -lGL -lm -ldl endif ifeq ($(PLAT),sunos) -CC=gcc CFLAGS=-g -pipe -fno-math-errno LIBS=-lm -lsocket -lX11 -lXi -lGL endif @@ -103,29 +100,29 @@ endif default: $(PLAT) web: - $(MAKE) $(ENAME) PLAT=web -j$(JOBS) + $(MAKE) $(ENAME) PLAT=web linux: - $(MAKE) $(ENAME) PLAT=linux -j$(JOBS) + $(MAKE) $(ENAME) PLAT=linux mingw: - $(MAKE) $(ENAME) PLAT=mingw -j$(JOBS) + $(MAKE) $(ENAME) PLAT=mingw sunos: - $(MAKE) $(ENAME) PLAT=sunos -j$(JOBS) + $(MAKE) $(ENAME) PLAT=sunos mac_x32: - $(MAKE) $(ENAME) PLAT=mac_x32 -j$(JOBS) + $(MAKE) $(ENAME) PLAT=mac_x32 mac_x64: - $(MAKE) $(ENAME) PLAT=mac_x64 -j$(JOBS) + $(MAKE) $(ENAME) PLAT=mac_x64 freebsd: - $(MAKE) $(ENAME) PLAT=freebsd -j$(JOBS) + $(MAKE) $(ENAME) PLAT=freebsd openbsd: - $(MAKE) $(ENAME) PLAT=openbsd -j$(JOBS) + $(MAKE) $(ENAME) PLAT=openbsd netbsd: - $(MAKE) $(ENAME) PLAT=netbsd -j$(JOBS) + $(MAKE) $(ENAME) PLAT=netbsd dragonfly: - $(MAKE) $(ENAME) PLAT=dragonfly -j$(JOBS) + $(MAKE) $(ENAME) PLAT=dragonfly haiku: - $(MAKE) $(ENAME) PLAT=haiku -j$(JOBS) + $(MAKE) $(ENAME) PLAT=haiku serenityos: - $(MAKE) $(ENAME) PLAT=serenityos -j$(JOBS) + $(MAKE) $(ENAME) PLAT=serenityos clean: $(DEL) $(OBJECTS) diff --git a/src/MapRenderer.h b/src/MapRenderer.h index 238d8508d..ad4863bdf 100644 --- a/src/MapRenderer.h +++ b/src/MapRenderer.h @@ -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-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ struct IGameComponent; extern struct IGameComponent MapRenderer_Component; diff --git a/src/Menus.h b/src/Menus.h index 5b797a60d..2f7db3ae7 100644 --- a/src/Menus.h +++ b/src/Menus.h @@ -3,7 +3,7 @@ #include "Core.h" /* Contains all 2D menu screen implementations. - Copyright 2014-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ struct Screen; int Menu_PointerDown(void* screen, int id, int x, int y); diff --git a/src/Model.h b/src/Model.h index 66c8094cc..6cdde7273 100644 --- a/src/Model.h +++ b/src/Model.h @@ -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-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ struct Entity; struct AABB; diff --git a/src/PackedCol.h b/src/PackedCol.h index d83baf4be..ee484f949 100644 --- a/src/PackedCol.h +++ b/src/PackedCol.h @@ -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-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ typedef cc_uint32 PackedCol; diff --git a/src/PickedPosRenderer.h b/src/PickedPosRenderer.h index 4a9951f62..2f7a203fb 100644 --- a/src/PickedPosRenderer.h +++ b/src/PickedPosRenderer.h @@ -2,7 +2,7 @@ #define CC_PICKEDPOSRENDERER_H #include "Core.h" /* Renders an outline around the block the player is looking at. - Copyright 2014-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ struct RayTracer; struct IGameComponent; diff --git a/src/Resources.h b/src/Resources.h index b0a86b913..962942342 100644 --- a/src/Resources.h +++ b/src/Resources.h @@ -2,7 +2,7 @@ #define CC_RESOURCES_H #include "Core.h" /* Implements checking, fetching, and patching the default game assets. - Copyright 2014-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ /* Number of resources that need to be downloaded. */ diff --git a/src/Screens.h b/src/Screens.h index 877e76a2c..bb8fba7f7 100644 --- a/src/Screens.h +++ b/src/Screens.h @@ -2,7 +2,7 @@ #define CC_SCREENS_H #include "Core.h" /* Contains all 2D non-menu screen implementations. - Copyright 2014-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ struct Screen; diff --git a/src/SelectionBox.h b/src/SelectionBox.h index 55a0ab764..f1cea5443 100644 --- a/src/SelectionBox.h +++ b/src/SelectionBox.h @@ -3,7 +3,7 @@ #include "Vectors.h" #include "PackedCol.h" /* Describes a selection box, and contains methods related to the selection box. - Copyright 2014-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ struct IGameComponent; extern struct IGameComponent Selections_Component; diff --git a/src/Stream.h b/src/Stream.h index 74dccc761..4cf0e1ea4 100644 --- a/src/Stream.h +++ b/src/Stream.h @@ -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-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ struct Stream; diff --git a/src/Widgets.h b/src/Widgets.h index bebb801fd..0cd8ae903 100644 --- a/src/Widgets.h +++ b/src/Widgets.h @@ -6,7 +6,7 @@ #include "Entity.h" #include "Inventory.h" /* Contains all 2D widget implementations. - Copyright 2014-2021 ClassiCube | Licensed under BSD-3 + Copyright 2014-2022 ClassiCube | Licensed under BSD-3 */ struct FontDesc;