Revision 938fc9af
Added by Leszek Koltunski over 3 years ago
| src/main/java/org/distorted/objectlib/json/JsonReader.java | ||
|---|---|---|
| 615 | 615 |
|
| 616 | 616 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 617 | 617 |
|
| 618 |
private void parseVersion1Metadata(JSONObject object) throws JSONException |
|
| 618 |
private void parseVersion1or2Metadata(JSONObject object) throws JSONException
|
|
| 619 | 619 |
{
|
| 620 | 620 |
JSONObject metadata = object.getJSONObject("metadata");
|
| 621 | 621 |
parseMetadata(metadata); |
| ... | ... | |
| 638 | 638 |
JSONObject object = new JSONObject(contents.toString()); |
| 639 | 639 |
int major = object.getInt("major");
|
| 640 | 640 |
|
| 641 |
if( major==1 ) |
|
| 642 |
{
|
|
| 643 |
parseVersion1(object); |
|
| 644 |
} |
|
| 645 |
if( major==2 ) |
|
| 646 |
{
|
|
| 647 |
parseVersion2(object); |
|
| 648 |
} |
|
| 641 |
if( major==1 ) parseVersion1(object); |
|
| 642 |
if( major==2 ) parseVersion2(object); |
|
| 649 | 643 |
else |
| 650 | 644 |
{
|
| 651 | 645 |
android.util.Log.e("readJsonFile", "Unknown version "+major);
|
| ... | ... | |
| 680 | 674 |
|
| 681 | 675 |
if( major==1 || major==2 ) |
| 682 | 676 |
{
|
| 683 |
parseVersion1Metadata(object); |
|
| 677 |
parseVersion1or2Metadata(object);
|
|
| 684 | 678 |
} |
| 685 | 679 |
else |
| 686 | 680 |
{
|
| ... | ... | |
| 718 | 712 |
JSONObject object = new JSONObject(contents.toString()); |
| 719 | 713 |
int major = object.getInt("major");
|
| 720 | 714 |
|
| 721 |
if( major==1 ) |
|
| 715 |
if( major==1 || major==2 )
|
|
| 722 | 716 |
{
|
| 723 | 717 |
JSONObject metadata = object.getJSONObject("metadata");
|
| 724 | 718 |
return metadata.getInt("scrambles");
|
| src/main/java/org/distorted/objectlib/main/ObjectType.java | ||
|---|---|---|
| 79 | 79 |
SKEW_3 ( TwistySkewb.class , new int[] {3,3,3,3} , 21, R.drawable.skew_3, true),
|
| 80 | 80 |
CONT_2 ( TwistyContainer.class , new int[] {2,2,2,2} , 12, R.drawable.cont_2, true),
|
| 81 | 81 |
|
| 82 |
VOID_3 ( TwistyVoid.class , new int[] {3,3,3} , 17, R.drawable.void_3, true), // wasDownloadableButNowIsBuiltIn()
|
|
| 83 |
CRYS_3 ( TwistyCrystal.class , new int[] {3,3,3,3,3,3}, 27, R.drawable.crys_3, true), // function!
|
|
| 84 |
STAR_3 ( TwistyStarminx.class , new int[] {3,3,3,3,3,3}, 27, R.drawable.star_3, true),
|
|
| 85 |
PENT_2 ( TwistyPentultimate.class , new int[] {2,2,2,2,2,2}, 21, R.drawable.pent_2, true),
|
|
| 82 |
VOID_3 ( TwistyVoid.class , new int[] {3,3,3} , 17, R.drawable.void_3, false), // wasDownloadableButNowIsBuiltIn()
|
|
| 83 |
CRYS_3 ( TwistyCrystal.class , new int[] {3,3,3,3,3,3}, 27, R.drawable.crys_3, false), // function!
|
|
| 84 |
STAR_3 ( TwistyStarminx.class , new int[] {3,3,3,3,3,3}, 27, R.drawable.star_3, false),
|
|
| 85 |
PENT_2 ( TwistyPentultimate.class , new int[] {2,2,2,2,2,2}, 21, R.drawable.pent_2, false),
|
|
| 86 | 86 |
|
| 87 | 87 |
; |
| 88 | 88 |
|
Also available in: Unified diff
Support reading num of scrambles from json version 2.