Skip to content

Normalize preprocessor version conditions #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Fenad2 merged 1 commit into from
Jul 31, 2026
Merged

Normalize preprocessor version conditions #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/main/java/com/listmore/config/ListMoreConfigs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import fi.dy.masa.malilib.config.options.ConfigStringList;
import fi.dy.masa.malilib.interfaces.IValueChangeCallback;
import fi.dy.masa.malilib.util.FileUtils;
//#if MC>=260100
//#if MC>=26.1
//$$ import fi.dy.masa.malilib.util.data.json.JsonUtils;
//#else
import fi.dy.masa.malilib.util.JsonUtils;
Expand Down Expand Up @@ -147,7 +147,7 @@ public static void init() {
}

public static void loadFromFile() {
//#if MC>=260100
//#if MC>=26.1
//$$ Path configDirectory = FileUtils.getConfigDirectory();
//#else
Path configDirectory = FileUtils.getConfigDirectoryAsPath();
Expand All @@ -159,7 +159,7 @@ public static void loadFromFile() {
return;
}

//#if MC>=260100
//#if MC>=26.1
//$$ JsonElement element = JsonUtils.parseJsonFile(configFile);
//#else
JsonElement element = JsonUtils.parseJsonFileAsPath(configFile);
Expand All @@ -186,7 +186,7 @@ private static void migrateLegacyConfig(Path configDirectory) {
}

public static void saveToFile() {
//#if MC>=260100
//#if MC>=26.1
//$$ Path dir = FileUtils.getConfigDirectory();
//#else
Path dir = FileUtils.getConfigDirectoryAsPath();
Expand All @@ -201,7 +201,7 @@ public static void saveToFile() {

JsonObject root = new JsonObject();
ConfigUtils.writeConfigBase(root, "Generic", Generic.OPTIONS);
//#if MC>=260100
//#if MC>=26.1
//$$ JsonUtils.writeJsonToFile(root, dir.resolve(CONFIG_FILE_NAME));
//#else
JsonUtils.writeJsonToFileAsPath(root, dir.resolve(CONFIG_FILE_NAME));
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/listmore/render/PlayerTracerHudRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.listmore.config.ListMoreConfigs;

import fi.dy.masa.malilib.interfaces.IRenderer;
//#if MC >= 12111
//#if MC >= 1.21.11
//$$ import fi.dy.masa.malilib.render.GuiContext;
//#else
import net.minecraft.client.gui.GuiGraphics;
Expand Down Expand Up @@ -32,7 +32,7 @@ public static PlayerTracerHudRenderer getInstance() {
//$$ public void onExtractGuiOverlayPost(GuiContext ctx, float partialTicks, ProfilerFiller profiler) {
//$$ render(ctx, partialTicks);
//$$ }
//#elseif MC >= 12111
//#elseif MC >= 1.21.11
//$$ @Override
//$$ public void onRenderGameOverlayPostAdvanced(GuiContext ctx, float partialTicks, ProfilerFiller profiler) {
//$$ render(ctx, partialTicks);
Expand All @@ -45,7 +45,7 @@ public void onRenderGameOverlayPostAdvanced(GuiGraphics ctx, float partialTicks,
//#endif

private static void render(
//#if MC >= 12111
//#if MC >= 1.21.11
//$$ GuiContext ctx,
//#else
GuiGraphics ctx,
Expand Down Expand Up @@ -138,7 +138,7 @@ private static ProjectedPoint projectPoint(double x, double y, double z, int gui
}

private static void drawLine(
//#if MC >= 12111
//#if MC >= 1.21.11
//$$ GuiContext ctx,
//#else
GuiGraphics ctx,
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/listmore/utils/WorldRenderUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ private WorldRenderUtils() {
public static Vec3 getCameraPosition() {
//#if MC >= 26.2
//$$ return Minecraft.getInstance().gameRenderer.mainCamera().position();
//#elseif MC >= 12111
//#elseif MC >= 1.21.11
//$$ return Minecraft.getInstance().gameRenderer.getMainCamera().position();
//#else
return Minecraft.getInstance().gameRenderer.getMainCamera().getPosition();
Expand Down Expand Up @@ -91,7 +91,7 @@ private static RenderContext createOutlineContext(String id) {
//$$ , 0
//#endif
);
//#if MC < 12111
//#if MC < 1.21.11
context.lineWidth(2.0F);
//#endif
return context;
Expand All @@ -101,7 +101,7 @@ private static RenderContext createOutlineContext(String id) {
private static void drawBoxOutline(float minX, float minY, float minZ, float maxX, float maxY, float maxZ,
Color4f color, BufferBuilder builder) {
RenderUtils.drawBoxAllEdgesBatchedLines(minX, minY, minZ, maxX, maxY, maxZ, color
//#if MC >= 12111
//#if MC >= 1.21.11
//$$ , 2.0F
//#endif
, builder);
Expand Down