Revision d433b50e
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/main/RubikObjectLibInterface.java | ||
|---|---|---|
| 38 | 38 |
import org.distorted.objectlib.helpers.BlockController; |
| 39 | 39 |
import org.distorted.objectlib.helpers.ObjectLibInterface; |
| 40 | 40 |
import org.distorted.objectlib.main.ObjectControl; |
| 41 |
import org.distorted.objectlib.main.ObjectType; |
|
| 42 | 41 |
|
| 43 | 42 |
import org.distorted.dialogs.RubikDialogNewRecord; |
| 44 | 43 |
import org.distorted.dialogs.RubikDialogSolved; |
| 45 | 44 |
import org.distorted.network.RubikScores; |
| 45 |
import org.distorted.objects.RubikObject; |
|
| 46 |
import org.distorted.objects.RubikObjectList; |
|
| 46 | 47 |
import org.distorted.screens.RubikScreenPlay; |
| 47 | 48 |
import org.distorted.screens.RubikScreenReady; |
| 48 | 49 |
import org.distorted.screens.RubikScreenSolver; |
| ... | ... | |
| 99 | 100 |
{
|
| 100 | 101 |
RubikScreenPlay play= (RubikScreenPlay) ScreenList.PLAY.getScreenClass(); |
| 101 | 102 |
RubikScores scores = RubikScores.getInstance(); |
| 102 |
ObjectType object = play.getObject(); |
|
| 103 |
int level = play.getLevel(); |
|
| 104 |
String name = scores.getName(); |
|
| 105 | 103 |
|
| 106 |
String record = object.name()+" level "+level+" time "+mNewRecord+" isNew: "+mIsNewRecord+" scrambleNum: "+scrambleNum; |
|
| 104 |
int object = play.getObject(); |
|
| 105 |
int level = play.getLevel(); |
|
| 106 |
String name = scores.getName(); |
|
| 107 |
RubikObject obj = RubikObjectList.getObject(object); |
|
| 108 |
|
|
| 109 |
String record = obj+" level "+level+" time "+mNewRecord+" isNew: "+mIsNewRecord+" scrambleNum: "+scrambleNum; |
|
| 107 | 110 |
|
| 108 | 111 |
if( BuildConfig.DEBUG ) |
| 109 | 112 |
{
|
| ... | ... | |
| 431 | 434 |
RubikScreenSolver solver = (RubikScreenSolver) ScreenList.SVER.getScreenClass(); |
| 432 | 435 |
int color = solver.getCurrentColor(); |
| 433 | 436 |
RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass(); |
| 434 |
ObjectType currObject = play.getObject();
|
|
| 437 |
int currObject = play.getObject();
|
|
| 435 | 438 |
mLastCubitColor = SolverMain.cubitIsLocked(currObject,cubit); |
| 436 | 439 |
mLastCubit = cubit; |
| 437 | 440 |
mLastCubitFace = face; |
Also available in: Unified diff
In the 'magic' app, ObjectType is now only used in RubikObject and RubikObjectList classes and nowhere else.
This is a major step towards being able to download objects from an online repository.