Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adopted the changes from most up to date fork + additional fixes #45

Open
wants to merge 40 commits into
base: master
Choose a base branch
from
Open

Adopted the changes from most up to date fork + additional fixes #45

wants to merge 40 commits into from

Conversation

uap-universe
Copy link

I took the most recent fork and updated the documentation as well as implemented some minor fixes.

Most importantly akudeukie added Support for Minecraft 1.5.

slicedlime and others added 30 commits October 27, 2012 00:25
-f sets the format (png, jpeg or both)
-j sets jpeq quality
- Optimized former macro functions a fair bit.
- Use a struct with id/data to simplify code a lot.
- Got rid of uninitialized variables by using the above struct as return value.
- Fixed crash bug when trying to shadow the bottom block in a row (access block -1)
- Added a few asserts to sanity check function inputs/outputs.
Added new blocks:
- carrot crops
- potato crops
- Simplified some access code that was doing things in over-complex ways or using needless branching.
- Moved common early-outs earlier to avoid doing calculations.
- Delay doing some calculations until really needed.
- Store block data in uint16 internally, instead of doing conversion from source format (mcr/anvil). This takes up 4 bits of wasted space per block but speeds up access. Complexity of access has now been moved to load time, but we access blocks far more often than we load chunks.
Added new blocks:
- Command Block
- Implemented rendering of Cobblestone/Moss walls (acceptable, but with
minor anomalies in rendered tiles in blocks-X.png)
Added new blocks:
- Anvil;
- Beacon;
- Wooden button.
Improved cobblestone wall sprite generation (final).
Cleaned up hardcoded values in Beacon drawing code;
Added extra detail to Anvil block.
- Added flower pots!
- Made fence gate more prominent (taller);
- Cleaned up and reworked base tile drawing code; Now it draws precise
and correct base tiles; Also made it easier to reuse.
Conflicts:
	Makefile
	blockimages.cpp
	blockimages.h
	chunk.cpp
	chunk.h
	map.cpp
	map.h
	pigmap.cpp
	region.h
	render.cpp
	rgba.cpp
	rgba.h
	tables.cpp
	tables.h
	template.html
	utils.cpp
Major changes:
- Rewrote & refactored block tile generation code;
- Block IDs are no more hard-coded (for the most part);
- Added external block configuration files;
- Added ability to apply few filters to textures (when generating block
tiles);
New blocks from upcoming Minecraft 1.5:
- Trapped Chest;
- Weighted pressure plates (light + heavy);
- Redstone comparator;
- Daylight Sensor;
- Block of Redstone;
- Nether Quartz Ore;
- Hopper;
- Block of Quartz;
- Quartz Stairs;
- Quartz Slab;
- Activator Rail;
- Dropper.
Other changes:
- Added few functions for manipulating RGBAImage;
- Changed to UNIX EOL formatting in modified files.
blockimages.cpp requires c++11 standart support, since it uses
<unordered_map>
akudeukie and others added 10 commits January 24, 2013 02:23
Conflicts:
	Makefile
	blockimages.cpp
	blockimages.h
	render.cpp
	rgba.cpp
	rgba.h

Merged with other fork changes (JPEG support, performance improvements, usability improvements)
version.h file is missing.
Updated documentation + blocklist location changed (by UniversE)
New blocks from upcoming Minecraft 1.6:
- Hay Block;
- Carpet;
- Hardened Clay;
- Block of Coal.
-Updated up to 13w19a snapshot changes;
-Added Stained Hardened Clay block;
-Aligned wool carpet height to 1 unit/pixel down from 2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants