Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed annotations retention / Mobile block bugfix

Browse Source
This commit is contained in:
Anuken
2018-09-25 17:18:50 -04:00
parent 554d9b4047
commit 3ce16e0ed1
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
annotations/src/io/anuke/annotations/Annotations.java
View File

@@ -9,7 +9,7 @@ public class Annotations{
/** Marks a class as serializable.*/ /** Marks a class as serializable.*/
@Target(ElementType.TYPE) @Target(ElementType.TYPE)
@Retention(RetentionPolicy.CLASS) @Retention(RetentionPolicy.SOURCE)
public @interface Serialize{ public @interface Serialize{
} }
@@ -63,7 +63,7 @@ public class Annotations{
/** Marks a method as invokable remotely across a server/client connection. */ /** Marks a method as invokable remotely across a server/client connection. */
@Target(ElementType.METHOD) @Target(ElementType.METHOD)
@Retention(RetentionPolicy.CLASS) @Retention(RetentionPolicy.SOURCE)
public @interface Remote{ public @interface Remote{
/** Specifies the locations from which this method can be invoked. */ /** Specifies the locations from which this method can be invoked. */
Loc targets() default Loc.server; Loc targets() default Loc.server;
@@ -93,7 +93,7 @@ public class Annotations{
* being the type returned by {@link #value()}. * being the type returned by {@link #value()}.
*/ */
@Target(ElementType.METHOD) @Target(ElementType.METHOD)
@Retention(RetentionPolicy.CLASS) @Retention(RetentionPolicy.SOURCE)
public @interface WriteClass{ public @interface WriteClass{
Class<?> value(); Class<?> value();
} }
@@ -104,7 +104,7 @@ public class Annotations{
* and have one parameter, being of type {@link java.nio.ByteBuffer}. * and have one parameter, being of type {@link java.nio.ByteBuffer}.
*/ */
@Target(ElementType.METHOD) @Target(ElementType.METHOD)
@Retention(RetentionPolicy.CLASS) @Retention(RetentionPolicy.SOURCE)
public @interface ReadClass{ public @interface ReadClass{
Class<?> value(); Class<?> value();
} }

4
core/src/io/anuke/mindustry/input/MobileInput.java
View File

@@ -468,7 +468,7 @@ public class MobileInput extends InputHandler implements GestureListener{
int y = lineStartY + i * Mathf.sign(tile.y - lineStartY) * Mathf.bool(!result.isX()); int y = lineStartY + i * Mathf.sign(tile.y - lineStartY) * Mathf.bool(!result.isX());
if(!checkOverlapPlacement(x, y, recipe.result) && validPlace(x, y, recipe.result, result.rotation)){ if(!checkOverlapPlacement(x, y, recipe.result) && validPlace(x, y, recipe.result, result.rotation)){
PlaceRequest request = new PlaceRequest(x * tilesize, y * tilesize, recipe, result.rotation); PlaceRequest request = new PlaceRequest(x * tilesize + recipe.result.offset(), y * tilesize + recipe.result.offset(), recipe, result.rotation);
request.scale = 1f; request.scale = 1f;
selection.add(request); selection.add(request);
} }
@@ -557,7 +557,7 @@ public class MobileInput extends InputHandler implements GestureListener{
removeRequest(getRequest(cursor)); removeRequest(getRequest(cursor));
}else if(mode == placing && isPlacing() && validPlace(cursor.x, cursor.y, recipe.result, rotation) && !checkOverlapPlacement(cursor.x, cursor.y, recipe.result)){ }else if(mode == placing && isPlacing() && validPlace(cursor.x, cursor.y, recipe.result, rotation) && !checkOverlapPlacement(cursor.x, cursor.y, recipe.result)){
//add to selection queue if it's a valid place position //add to selection queue if it's a valid place position
selection.add(lastPlaced = new PlaceRequest(cursor.worldx(), cursor.worldy(), recipe, rotation)); selection.add(lastPlaced = new PlaceRequest(cursor.worldx() + recipe.result.offset(), cursor.worldy() + recipe.result.offset(), recipe, rotation));
}else if(mode == breaking && validBreak(cursor.target().x, cursor.target().y) && !hasRequest(cursor.target())){ }else if(mode == breaking && validBreak(cursor.target().x, cursor.target().y) && !hasRequest(cursor.target())){
//add to selection queue if it's a valid BREAK position //add to selection queue if it's a valid BREAK position
cursor = cursor.target(); cursor = cursor.target();