Minimize preprocessor code duplicates

Author: BluSpring

src/client/java/net/irisshaders/imgui/ImGuiMC.java

@@ -5,8 +5,6 @@
 import com.mojang.blaze3d.opengl.GlDevice;
 import com.mojang.blaze3d.opengl.GlStateManager;
 import com.mojang.blaze3d.opengl.GlTexture;
-//?} else {
-
 //?}
 import com.mojang.blaze3d.systems.RenderSystem;
 import imgui.ImGui;

src/client/java/net/irisshaders/imgui/mixin/DrawMixin.java

@@ -10,17 +10,9 @@
 
 @Mixin(Minecraft.class)
 public class DrawMixin {
-    //? if >=1.21 {
-    @Inject(method = "runTick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/GameRenderer;render(Lnet/minecraft/client/DeltaTracker;Z)V", shift = At.Shift.AFTER))
+    @Inject(method = "runTick", at = @At(value = "INVOKE", target = /*? if >= 1.21 {*/"Lnet/minecraft/client/renderer/GameRenderer;render(Lnet/minecraft/client/DeltaTracker;Z)V"/*?} else {*//*"Lnet/minecraft/client/renderer/GameRenderer;render(FJZ)V"*//*?}*/, shift = At.Shift.AFTER))
     private void imgui$draw(boolean bl, CallbackInfo ci) {
         ImGui.showDemoWindow();
         ImGuiMC.getInstance().draw();
     }
-    //?} else {
-    /*@Inject(method = "runTick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/GameRenderer;render(FJZ)V", shift = At.Shift.AFTER))
-    private void imgui$draw(boolean bl, CallbackInfo ci) {
-        ImGui.showDemoWindow();
-        ImGuiMC.getInstance().draw();
-    }
-    *///?}
 }

src/client/java/net/irisshaders/imgui/mixin/RendererInitMixin.java

@@ -4,13 +4,11 @@
 import com.mojang.blaze3d.TracyFrameCapture;
 import com.mojang.blaze3d.shaders.ShaderType;
 import com.mojang.blaze3d.systems.RenderSystem;
-//?} elif >1.21 {
-/*import com.mojang.blaze3d.systems.RenderSystem;
-*///?} else {
+//?} else {
 /*import com.mojang.blaze3d.systems.RenderSystem;
+import net.minecraft.client.Minecraft;
 *///?}
 import net.irisshaders.imgui.ImGuiMC;
-import net.minecraft.client.Minecraft;
 import net.minecraft.resources.ResourceLocation;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -21,33 +19,25 @@
 
 @Mixin(RenderSystem.class)
 public class RendererInitMixin {
-	//? if =1.21.5 {
 	@Inject(at = @At("RETURN"), method = "initRenderer", remap = false)
+	//? if = 1.21.5 {
 	private static void imgui$initRenderer(long window, int i, boolean bl, BiFunction<ResourceLocation, ShaderType, String> biFunction, boolean bl2, CallbackInfo ci) {
 		ImGuiMC.getInstance().onRendererInit(window);
 	}
+	//?} else {
+	/*private static void imgui$initRenderer(int i, boolean bl, CallbackInfo ci) {
+		ImGuiMC.getInstance().onRendererInit(Minecraft.getInstance().getWindow().getWindow());
+	}
+	*///?}
+
 	@Inject(at = @At("RETURN"), method = "flipFrame", remap = false)
-	private static void imgui$newFrame(long l, TracyFrameCapture tracyFrameCapture, CallbackInfo ci) {
+	private static void imgui$newFrame(
+		long l,
+		//? if >= 1.21.5
+		TracyFrameCapture tracyFrameCapture,
+		CallbackInfo ci
+	) {
 		ImGuiMC.getInstance().afterPollEvents(l);
 	}
-//?} elif >1.21 {
-    /*@Inject(at = @At("RETURN"), method = "initRenderer", remap = false)
-    private static void imgui$initRenderer(int i, boolean bl, CallbackInfo ci) {
-        ImGuiMC.getInstance().onRendererInit(Minecraft.getInstance().getWindow().getWindow());
-    }
-    @Inject(at = @At("RETURN"), method = "flipFrame", remap = false)
-    private static void imgui$newFrame(long l, CallbackInfo ci) {
-        ImGuiMC.getInstance().afterPollEvents(l);
-    }
-*///?} else {
-    /*@Inject(at = @At("RETURN"), method = "initRenderer", remap = false)
-    private static void imgui$initRenderer(int i, boolean bl, CallbackInfo ci) {
-        ImGuiMC.getInstance().onRendererInit(Minecraft.getInstance().getWindow().getWindow());
-    }
-    @Inject(at = @At("RETURN"), method = "flipFrame", remap = false)
-    private static void imgui$newFrame(long l, CallbackInfo ci) {
-        ImGuiMC.getInstance().afterPollEvents(l);
-    }
-*///?}
 
 }