mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-29 06:07:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes / Mender block / Extra stats / Balancing

Browse Source
This commit is contained in:
Anuken
2019-03-26 11:05:47 -04:00
parent 0b1e2bf19b
commit 10c999a4a2
29 changed files with 1957 additions and 1822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
annotations/src/main/java/io/anuke/annotations/Annotations.java
View File

@ -7,13 +7,13 @@ import java.lang.annotation.Target;
public class Annotations{
@Target(ElementType.METHOD)
@Target({ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.SOURCE)
public @interface Nullable{
}
@Target(ElementType.METHOD)
@Target({ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.SOURCE)
public @interface NonNull{

2
annotations/src/main/java/io/anuke/annotations/StructAnnotationProcessor.java
View File

@ -129,7 +129,7 @@ public class StructAnnotationProcessor extends AbstractProcessor{
//floats: need conversion
setter.addStatement("return ($T)(($L & $L) | (($T)Float.floatToIntBits(value) << $LL))", structType, structParam, bitString(offset, size, structTotalSize), structType, offset);
}else{
cons.append(" | (").append("(").append(structType).append(")").append(varName).append(" << ").append(offset).append("L)");
cons.append(" | (((").append(structType).append(")").append(varName).append(" << ").append(offset).append("L)").append(" & ").append(bitString(offset, size, structTotalSize)).append(")");
//bytes, shorts, chars, ints
setter.addStatement("return ($T)(($L & $L) | (($T)value << $LL))", structType, structParam, bitString(offset, size, structTotalSize), structType, offset);