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 680457b41..178d085c4 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 @@ -62,6 +62,7 @@ public class BlockColorWrapper implements IBlockColorWrapper System.out.println(block + " color " + Integer.toHexString(color) + " to tint " + toTint + " folliageTint " + folliageTint + " grassTint " + grassTint + " waterTint " + waterTint); } + /** * this return a wrapper of the block in input * @param blockState of the block to wrap @@ -236,6 +237,11 @@ public class BlockColorWrapper implements IBlockColorWrapper return block == Blocks.WATER; } + @Override + public String getName() { + return block.getName().toString(); + } + //--------------// //Colors getters// //--------------// @@ -246,10 +252,6 @@ public class BlockColorWrapper implements IBlockColorWrapper return isColored; } - @Override - public String getName() { - return block.getName().toString(); - } @Override public int getColor() 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 89fb5f638..0dcd64480 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,11 +196,11 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper int col = ((c.getRed() & 0xFF) << 16) | // blue - ((c.getGreen() & 0xFF) << 8) | // green - ((c.getBlue() & 0xFF)) | // red - ((c.getAlpha() & 0xFF) << 24); // alpha - + ((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 ;) pixels[u * lightMapWidth + v] = col; 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 993cdca17..22aa32e0b 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