Update to Minecraft 1.8 and 1.9 #13

Pokechu22 · 2016-03-22T01:52:04Z

Pretty much a complete rework for 1.8 and 1.9.

Jawa is now used instead of solum
The JSON format is roughly the same, but in many cases textual IDs are used instead of numeric IDs.
Biomes are reformatted due to 1.9 adding two types of text IDs for them
Packet instructions was completely rewritten. The format is mostly the same, though. There's just different packet names to deal with the different states.
Recipes are no longer upside down.
Recipe format tweaked
Several other JSON layout changes as were necessary

And a few other notes:

Objects and entities might not be 100% stable, but they should work
Sounds doesn't work in 1.8. I could make it work, but most of the data from 1.9 is more useful.
I don't know if I should keep setup.py in it. It looks like it's solum's setup.py, so it might be wrong to keep that there (in fact, I'm not entirely sure why it's there).
This doesn't work on all of the 1.9 snapshots (last time I tested it, at least). It might work now or it might not; as necessary I'll try to get them supported.

I've continued with what @deathcap did in #12.

Here's some demos with a tweaked version of vitrine (which I haven't released yet):

…bute if it exists.

…ler, added Disassembler. Stubbed out Context.

…pswitch, existing code does not need to be (but should be) changed. Lookupswitch's value has been changed to a tuple.

namedtuple for < 2.6

…_init__. Fix a raise.

…r() added.

JarFile no longer has a map() method. Processing will be left up to the user, if required. Added .classes(), .all(), .class_list(), .count(), .o pen_class(). This should suffice for the majority of users, and extende d functionality can be implemented using the JarFile.zp property.

In 1.9, writing varints and such return the packetbuffer where previously they returned void. Thus, the existing tests did not find the method, and then the position method was assumed (it's used for packetbuffer methods that don't match anything else, since there is no other good way to identify it). The fix is to test if a method is obfuscated by the length, thus preventing ambiguity between writeInt and writeVarInt.

Vanilla Minecraft doesn't put any comments in its language files that I'm aware of, but the language system _does_ ignore lines starting with '#' so we should too.

Fixes #1

This is the first half; the second half will involve sounds.json and subtitles.

This makes things like iterators clearer.

It should now use the correct numbers for its values.

This is incomplete. However, it should eventually fix the way that recipes are read, and make the code a bit cleaner (I think).

It can now parse and return everything needed. I just need to make the JSON more consistant (items with metadata vs items without).

It's still not perfect, but it's better.

The read material was ignored, so the array index was instead used.

I'm not sure how good of an idea this is, as it's a lot of redundant data, but it makes vitrine simpler. I might revert this later.

Rather than just moving everything to the side, generating broken results.

Heights and color should now work.

This helps deal with Mesa Plateau F M M. Normal plateau wasn't saved since the last item in the list was no longer saved; thus, it just used the last biome.

This was removed in 1.9, and wasn't used at all in 1.8. Better to not track it than to cause issues later on.

1.9 made a significant number of changes to the biome storage, meaning that a lot of the biome processing code needed to be rewritten. That's been done, and biomes work now. I also had to change the JSON format for iomes, since I needed to store a list of biome fields. It now resembles blocks and items more closely.

Previously, in 1.8 biome_fields would store the same data as biomes. Now, it matches 1.9 in storing only the biome name.

This caused some issues with 1.9, particularly since it didn't read all of the different things that should be identified (the list was too short).

* Update README to reflect current state * Remove solum stuff from README (we're using jawa now) * Remove temporary hack from munch.py * Make website.py load 1.9 rather than 1.8.3 Closes #12 (since this extends upon it)

rom1504 · 2016-03-24T17:52:20Z

nice 👍

Tyler Kennedy and others added 30 commits April 13, 2011 22:01

Extremely buggy commit, not suitable for production.

84c1207

Copyright notice and encoding header

ff6b1e8

Python 2.5 compatibility fixes, implemented AttributeTable.find_one()

510b89f

Added field flag properties

df4c5dd

Added method flag properties

b60025f

Added class flag properities

c7a2f5b

Default __repr__ for Attribute()

9e3b1a3

Small convienience property, .code on methods. Returns the code attri…

b7edc62

…bute if it exists.

Ding. [Not production worthy]

089e5c5

Fixed errors in bytecode.py. Removed StreamAssembler, StreamDisassemb…

9b49624

…ler, added Disassembler. Stubbed out Context.

Started filling in README.md, renamed map_classes to map, small bugfix.

ce39b5f

Fixed missing package in setup.py

ae2951f

Removed subclass from JarFile.

4dc89c5

Fixed the 0xC4 'wide' instruction not getting picked up.'

2cb662e

Removed unused method

3db278a

PEP8'd bytecode.py

7d57dc3

Switch to using the namedtuple Operand(). With the exception of Looku…

3e23936

…pswitch, existing code does not need to be (but should be) changed. Lookupswitch's value has been changed to a tuple.

Python 2.5 compatibility.

7108bda

namedtuple for < 2.6

Ignore distutils build folder.

312fb0e

Added 'error' parameter. If True, raise an error instead of coping.

ad859d7

Performance tweak on map(parallel=False). Expose Operand() in Solum._…

6f9d0ae

…_init__. Fix a raise.

.classes() and .other() now return copies. iterclasses() and iterothe…

74082c1

…r() added.

Added .read(), .class_count(), fixed .open_class().

481ad68

Oops, forgot version bump.

412424d

PEP8'd methods.py

170bf8a

PEP8'd classfile.py

8868a54

PEP8'd fields.py

7381e99

PEP8'd attributes.py

affeceb

PEP8'd constants.py

b8dde02

Pokechu22 added 28 commits February 28, 2016 12:34

Use hexadecimal for packet names

3ca6930

Ignore comments in language files

abfa098

Vanilla Minecraft doesn't put any comments in its language files that I'm aware of, but the language system _does_ ignore lines starting with '#' so we should too.

Handle varint and long arrays

367aadf

Fixes #1

Update sounds.py to 1.9

4e6a594

This is the first half; the second half will involve sounds.json and subtitles.

Add actual sound files and the subtitles

7b920b7

Provide the asset hash for sounds as well

09fec69

Handle special case where the sound is a dict instead of a string

20e088a

Fix 'or' and 'xor' not getting included in packetinstructions.

2de1c55

Keep track of what is stored in various variables.

17f91ea

This makes things like iterators clearer.

Fix Tstore

6ceedd2

Fix tableswitch

bdb41d4

It should now use the correct numbers for its values.

Partially rewrite recipes

4671c6a

This is incomplete. However, it should eventually fix the way that recipes are read, and make the code a bit cleaner (I think).

Closer reading of recipes - parse the varargs array

064c8a9

Near-final version of recipes

6a965b2

It can now parse and return everything needed. I just need to make the JSON more consistant (items with metadata vs items without).

Improve item format

b59d447

It's still not perfect, but it's better.

Recipes: Fix random numbers being used instead of materials

88100e3

The read material was ignored, so the array index was instead used.

Safely handle cases where sounds.json or the asset index couldn't load

d0433ac

Store item data with recipes as well

ce87b49

I'm not sure how good of an idea this is, as it's a lot of redundant data, but it makes vitrine simpler. I might revert this later.

Add None to rows where no items are

5f25fb8

Rather than just moving everything to the side, generating broken results.

Fix biome data reading

0a31e89

Heights and color should now work.

Handle M varients of biomes.

edccca5

Store the current biome before starting varients

4cbb2df

This helps deal with Mesa Plateau F M M. Normal plateau wasn't saved since the last item in the list was no longer saved; thus, it just used the last biome.

Stop storing color

8786ea2

This was removed in 1.9, and wasn't used at all in 1.8. Better to not track it than to cause issues later on.

Make biome_fields only store the biome name, not the whole biome

5e4ebae

Previously, in 1.8 biome_fields would store the same data as biomes. Now, it matches 1.9 in storing only the biome name.

Clean up identify and add a few unmarked dependencies

0a7f6f1

This caused some issues with 1.9, particularly since it didn't read all of the different things that should be identified (the list was too short).

Prepare for release

7621112

* Update README to reflect current state * Remove solum stuff from README (we're using jawa now) * Remove temporary hack from munch.py * Make website.py load 1.9 rather than 1.8.3 Closes #12 (since this extends upon it)

TkTech merged commit 25c5184 into TkTech:master Mar 24, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update to Minecraft 1.8 and 1.9 #13

Update to Minecraft 1.8 and 1.9 #13

Pokechu22 commented Mar 22, 2016

rom1504 commented Mar 24, 2016

Update to Minecraft 1.8 and 1.9 #13

Update to Minecraft 1.8 and 1.9 #13

Conversation

Pokechu22 commented Mar 22, 2016

rom1504 commented Mar 24, 2016