Turbine generator tweaks

annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java

@@ -170,6 +170,7 @@ public class EntityProcess extends BaseProcessor{
         }else if(round == 2){ //round 2: get component classes and generate interfaces for them
 
             //parse groups
+            //this needs to be done before the entity interfaces are generated, as the entity classes need to know which groups to add themselves to
             for(Selement<?> group : allGroups){
                 GroupDef an = group.annotation(GroupDef.class);
                 Seq<Stype> types = types(an, GroupDef::value).map(this::interfaceToComp);

annotations/src/main/java/mindustry/annotations/util/Selement.java

@@ -60,7 +60,6 @@ public class Selement<T extends Element>{
     }
 
     public <A extends Annotation> A annotation(Class<A> annotation){
-        if(true) return e.getAnnotation(annotation);
         try{
             Method m = com.sun.tools.javac.code.AnnoConstruct.class.getDeclaredMethod("getAttribute", Class.class);
             m.setAccessible(true);

core/src/mindustry/world/blocks/power/BurnerGenerator.java

@@ -1,9 +1,13 @@
 package mindustry.world.blocks.power;
 
-import mindustry.type.Item;
+import arc.graphics.g2d.*;
-import mindustry.type.Liquid;
+import mindustry.annotations.Annotations.*;
+import mindustry.type.*;
 
 public class BurnerGenerator extends ItemLiquidGenerator{
+    public @Load(value = "@-turbine#", length = 2) TextureRegion[] turbineRegions;
+    public @Load("@-cap") TextureRegion capRegion;
+    public float turbineSpeed = 2f;
 
     public BurnerGenerator(String name){
         super(true, false, name);
@@ -18,4 +22,24 @@ public class BurnerGenerator extends ItemLiquidGenerator{
     protected float getItemEfficiency(Item item){
         return item.flammability;
     }
+
+    @Override
+    public TextureRegion[] icons(){
+        return turbineRegions[0].found() ? new TextureRegion[]{region, turbineRegions[0], turbineRegions[1], capRegion} : super.icons();
+    }
+
+    public class BurnerGeneratorEntity extends ItemLiquidGeneratorEntity{
+
+        @Override
+        public void draw(){
+            super.draw();
+
+            if(turbineRegions[0].found()){
+                Draw.rect(turbineRegions[0], x, y, totalTime * turbineSpeed);
+                Draw.rect(turbineRegions[1], x, y, -totalTime * turbineSpeed);
+
+                Draw.rect(capRegion, x, y);
+            }
+        }
+    }
 }

core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java

@@ -45,7 +45,6 @@ public class ItemLiquidGenerator extends PowerGenerator{
 
     public ItemLiquidGenerator(String name){
         super(name);
-        this.entityType = ItemLiquidGeneratorEntity::new;
     }
 
     protected void setDefaults(){
@@ -88,6 +87,7 @@ public class ItemLiquidGenerator extends PowerGenerator{
     public class ItemLiquidGeneratorEntity extends GeneratorEntity{
         public float explosiveness;
         public float heat;
+        public float totalTime;
 
         @Override
         public boolean productionValid(){
@@ -114,6 +114,7 @@ public class ItemLiquidGenerator extends PowerGenerator{
             }
 
             heat = Mathf.lerpDelta(heat, generateTime >= 0.001f ? 1f : 0f, 0.05f);
+            totalTime += heat;
 
             //liquid takes priority over solids
             if(hasLiquids && liquid != null && liquids.get(liquid) >= 0.001f){

settings.gradle

@@ -1,3 +1,8 @@
+if(JavaVersion.current() != JavaVersion.VERSION_1_8){
+    throw new GradleException("!!! YOU MUST USE JAVA 8 TO COMPILE AND RUN MINDUSTRY !!! Read the README. Your version: ${System.properties["java.version"]}\n" +
+            "\nThe reason: Java has a compiler bug that requires a workaround. This workaround uses proprietary API and is only implemented on Java 8.")
+}
+
 include 'desktop', 'core', 'server', 'ios', 'annotations', 'tools', 'tests'
 
 def use = { ... names ->