Merge branch 'dev' into shader-pipeline

.editorconfig

@@ -16,6 +16,7 @@ indent_size = 2
 
 [*.java]
 indent_style = tab
+ij_java_else_on_new_line = false
 ij_continuation_indent_size = 8
 ij_java_class_count_to_use_import_on_demand = 99
 ij_java_names_count_to_use_import_on_demand = 99

src/main/java/com/jozufozu/flywheel/backend/OptifineHandler.java

@@ -45,8 +45,7 @@ public class OptifineHandler {
 
 		if (optifine == null) {
 			Backend.log.info("Optifine not detected.");
-		}
+		} else {
-		else {
 			Backend.log.info("Optifine detected.");
 
 			refresh();

src/main/java/com/jozufozu/flywheel/backend/ShaderSources.java

@@ -210,8 +210,7 @@ public class ShaderSources implements ISelectiveResourceReloadListener {
 
 			while (filechannel.read(bytebuffer) != -1) {
 			}
-		}
+		} else {
-		else {
 			bytebuffer = MemoryUtil.memAlloc(8192);
 			ReadableByteChannel readablebytechannel = Channels.newChannel(is);
 

src/main/java/com/jozufozu/flywheel/backend/gl/GlNumericType.java

@@ -53,11 +53,9 @@ public enum GlNumericType {
 	public void castAndBuffer(ByteBuffer buf, int val) {
 		if (this == UBYTE || this == BYTE) {
 			buf.put((byte) val);
-		}
+		} else if (this == USHORT || this == SHORT) {
-		else if (this == USHORT || this == SHORT) {
 			buf.putShort((short) val);
-		}
+		} else if (this == UINT || this == INT) {
-		else if (this == UINT || this == INT) {
 			buf.putInt(val);
 		}
 	}

src/main/java/com/jozufozu/flywheel/backend/gl/buffer/GlBuffer.java

@@ -56,8 +56,7 @@ public class GlBuffer extends GlObject {
 	public MappedBuffer getBuffer(int offset, int length) {
 		if (Backend.getInstance().compat.mapBufferRange != MapBufferRange.UNSUPPORTED) {
 			return new MappedBufferRange(this, offset, length, GL30.GL_MAP_WRITE_BIT);
-		}
+		} else {
-		else {
 			MappedFullBuffer fullBuffer = new MappedFullBuffer(this, MappedBufferUsage.WRITE_ONLY);
 			fullBuffer.position(offset);
 			return fullBuffer;

src/main/java/com/jozufozu/flywheel/backend/instancing/InstanceManager.java

@@ -125,8 +125,7 @@ public abstract class InstanceManager<T> implements MaterialManager.OriginShiftL
 					removeInternal(obj, instance);
 
 					createInternal(obj);
-				}
+				} else {
-				else {
 					instance.update();
 				}
 			}
@@ -177,11 +176,9 @@ public abstract class InstanceManager<T> implements MaterialManager.OriginShiftL
 
 		if (instance != null) {
 			return instance;
-		}
+		} else if (create && canCreateInstance(obj)) {
-		else if (create && canCreateInstance(obj)) {
 			return createInternal(obj);
-		}
+		} else {
-		else {
 			return null;
 		}
 	}

src/main/java/com/jozufozu/flywheel/backend/loading/ShaderTemplate.java

@@ -47,8 +47,7 @@ public class ShaderTemplate {
 
 			if (struct != null) {
 				s = s.replace(name, struct.name);
-			}
+			} else {
-			else {
 				missing.add(name);
 			}
 		}

src/main/java/com/jozufozu/flywheel/backend/pipeline/SourceFile.java

@@ -59,8 +59,7 @@ public class SourceFile {
 			if (blockEnd > blockStart) {
 				self = new StringSpan(this, matcher.start(), blockEnd + 1);
 				body = new StringSpan(this, blockStart, blockEnd);
-			}
+			} else {
-			else {
 				self = new ErrorSpan(this, matcher.start(), matcher.end());
 				body = new ErrorSpan(this, blockStart);
 			}

src/main/java/com/jozufozu/flywheel/core/QuadConverter.java

@@ -101,8 +101,7 @@ public class QuadConverter {
 		ByteBuffer indices;
 		if (bytes > stack.getSize()) {
 			indices = MemoryUtil.memAlloc(bytes); // not enough space on the preallocated stack
-		}
+		} else {
-		else {
 			stack.push();
 			indices = stack.malloc(bytes);
 		}
@@ -119,8 +118,7 @@ public class QuadConverter {
 
 		if (bytes > stack.getSize()) {
 			MemoryUtil.memFree(indices);
-		}
+		} else {
-		else {
 			stack.pop();
 		}
 

src/main/java/com/jozufozu/flywheel/core/instancing/ConditionalInstance.java

@@ -38,8 +38,7 @@ public class ConditionalInstance<D extends InstanceData> {
 		if (shouldShow && instance == null) {
 			instance = model.createInstance();
 			if (setupFunc != null) setupFunc.accept(instance);
-		}
+		} else if (!shouldShow && instance != null) {
-		else if (!shouldShow && instance != null) {
 			instance.delete();
 			instance = null;
 		}

src/main/java/com/jozufozu/flywheel/core/instancing/GroupInstance.java

@@ -46,8 +46,7 @@ public class GroupInstance<D extends InstanceData> extends AbstractCollection<D>
 			for (int i = size; i < count; i++) {
 				addInstance();
 			}
-		}
+		} else {
-		else {
 			List<D> unnecessary = backing.subList(count, size);
 			unnecessary.forEach(InstanceData::delete);
 			unnecessary.clear();

src/main/java/com/jozufozu/flywheel/core/instancing/SelectInstance.java

@@ -37,8 +37,7 @@ public class SelectInstance<D extends InstanceData> {
 				current.delete();
 				current = null;
 			}
-		}
+		} else if (i != last) {
-		else if (i != last) {
 			if (current != null) current.delete();
 
 			current = models.get(i)

src/main/java/com/jozufozu/flywheel/core/materials/BasicData.java

@@ -44,8 +44,7 @@ public abstract class BasicData extends InstanceData implements IFlatLight<Basic
 		if (alpha) {
 			byte a = (byte) ((color >> 24) & 0xFF);
 			return setColor(r, g, b, a);
-		}
+		} else {
-		else {
 			return setColor(r, g, b);
 		}
 	}

src/main/java/com/jozufozu/flywheel/core/shader/ExtensibleGlProgram.java

@@ -35,8 +35,7 @@ public class ExtensibleGlProgram extends GlProgram {
 				list.add(extension);
 			}
 			this.extensions = list;
-		}
+		} else {
-		else {
 			this.extensions = Collections.emptyList();
 		}
 	}

src/main/java/com/jozufozu/flywheel/event/ForgeEvents.java

@@ -29,8 +29,7 @@ public class ForgeEvents {
 			if (right.size() < 10) {
 				right.add("");
 				right.add(text);
-			}
+			} else {
-			else {
 				right.add(9, "");
 				right.add(10, text);
 			}

src/main/java/com/jozufozu/flywheel/light/LightUpdater.java

@@ -150,8 +150,7 @@ public class LightUpdater {
 		if (set == null) {
 			set = new LongRBTreeSet();
 			listeners.put(listener, set);
-		}
+		} else {
-		else {
 			set.forEach((LongConsumer) l -> {
 				WeakHashSet<ILightUpdateListener> listeningSections = lookup.get(l);
 

src/main/java/com/jozufozu/flywheel/light/LightVolume.java

@@ -126,13 +126,11 @@ public class LightVolume {
 				sampleVolume = newSampleVolume;
 
 				copyLight(world, newArea);
-			}
+			} else {
-			else {
 				sampleVolume = newSampleVolume;
 				initialize(world);
 			}
-		}
+		} else {
-		else {
 			setSampleVolume(newSampleVolume);
 			int volume = textureVolume.volume();
 			if (volume * 2 > lightData.capacity()) {

src/main/java/com/jozufozu/flywheel/mixin/RenderHooksMixin.java

@@ -55,7 +55,8 @@ public class RenderHooksMixin {
 												.getProjectionMatrix());
 
 		MinecraftForge.EVENT_BUS.post(new RenderLayerEvent(world, type, viewProjection, camX, camY, camZ));
-		GL20.glUseProgram(0);
+
+		if (!OptifineHandler.usingShaders()) GL20.glUseProgram(0);
 	}
 
 	@Inject(at = @At("TAIL"), method = "loadRenderers")

src/main/java/com/jozufozu/flywheel/util/AnimationTickHolder.java

@@ -16,8 +16,7 @@ public class AnimationTickHolder {
 		if (!Minecraft.getInstance()
 				.isGamePaused()) {
 			ticks = (ticks + 1) % 1_728_000; // wrap around every 24 hours so we maintain enough floating point precision
-		}
+		} else {
-		else {
 			paused_ticks = (paused_ticks + 1) % 1_728_000;
 		}
 	}

src/main/java/com/jozufozu/flywheel/util/BakedQuadWrapper.java

@@ -201,19 +201,15 @@ public class BakedQuadWrapper {
 				int intOffset = FORMAT.getOffset(elementId) / Integer.BYTES;
 				if (element.getUsage() == VertexFormatElement.Usage.POSITION) {
 					position = intOffset;
-				}
+				} else if (element.getUsage() == VertexFormatElement.Usage.COLOR) {
-				else if (element.getUsage() == VertexFormatElement.Usage.COLOR) {
 					color = intOffset;
-				}
+				} else if (element.getUsage() == VertexFormatElement.Usage.UV) {
-				else if (element.getUsage() == VertexFormatElement.Usage.UV) {
 					if (element.getIndex() == 0) {
 						texture = intOffset;
-					}
+					} else if (element.getIndex() == 2) {
-					else if (element.getIndex() == 2) {
 						light = intOffset;
 					}
-				}
+				} else if (element.getUsage() == VertexFormatElement.Usage.NORMAL) {
-				else if (element.getUsage() == VertexFormatElement.Usage.NORMAL) {
 					normal = intOffset;
 				}
 			}

src/main/java/com/jozufozu/flywheel/util/CodecUtil.java

@@ -16,8 +16,7 @@ public class CodecUtil {
 				.xmap(either -> either.map(l -> l, Collections::singletonList), list -> {
 					if (list.size() == 1) {
 						return Either.right(list.get(0));
-					}
+					} else {
-					else {
 						return Either.left(list);
 					}
 				});