From 880559f94ab51482591884807a899429c953cf71 Mon Sep 17 00:00:00 2001 From: coolGi2007 Date: Fri, 10 Dec 2021 01:07:27 +0000 Subject: [PATCH] Updated core --- .../lod/common/wrappers/block/BlockColorWrapper.java | 1 + .../common/wrappers/minecraft/MinecraftRenderWrapper.java | 8 ++++---- core | 2 +- forge/src/main/resources/META-INF/mods.toml | 7 +++++++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockColorWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockColorWrapper.java index 846db1740..c20365846 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockColorWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockColorWrapper.java @@ -241,6 +241,7 @@ public class BlockColorWrapper implements IBlockColorWrapper { return block.getName().toString(); } + //--------------// //Colors getters// //--------------// diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java index 819dbc862..e4e9e522d 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java @@ -196,10 +196,10 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper // (0b11111111 << 24); // blue int col = - (c.getRed() & 0b11111111) + // red - ((c.getGreen() & 0b11111111) << 8) + // green - ((c.getBlue() & 0b11111111) << 16) + // blue - ((c.getAlpha() & 0b11111111) << 24); // alpha + ((c.getRed() & 0xFF) << 16) | // blue + ((c.getGreen() & 0xFF) << 8) | // green + ((c.getBlue() & 0xFF)) | // red + ((c.getAlpha() & 0xFF) << 24); // alpha // 2D array stored in a 1D array. // Thank you Tim from College ;) diff --git a/core b/core index cd50be653..1b82acec9 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit cd50be6531b6fac0e74df0bb9616a716c907157f +Subproject commit 1b82acec9f467e8eac0ef32840aaf2a5d45141e3 diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 0c2028326..75c6d940a 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -49,3 +49,10 @@ authors="James Seibel, Leonardo Amato, and Cola" #optional #// The description text for the mod (multi line!) (#mandatory) description='''This mod generates and renders simplified terrain beyond the normal view distance, at a low performance cost.''' + +#// to make mod be not required on forge server +acceptableRemoteVersions="*" + +#// to not load on server at all as there is no integration at all +#// TODO remove when we add server support +clientSideOnly=true \ No newline at end of file