Removed MHelper and Color util
This commit is contained in:
paulevsGitch
parent
78c33a35aa
commit
ab4c614eac
202 changed files with 400 additions and 1045 deletions
|
|
@ -5,6 +5,8 @@ import java.util.Comparator;
|
|||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import ru.bclib.util.ColorUtil;
|
||||
|
||||
public class ColorExtractor {
|
||||
private List<Center> centers = new ArrayList<>();
|
||||
private List<Integer> colors;
|
||||
|
|
|
|||
|
|
@ -1,241 +0,0 @@
|
|||
package ru.betterend.util;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.google.common.collect.Maps;
|
||||
import com.mojang.blaze3d.platform.NativeImage;
|
||||
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.Environment;
|
||||
import net.fabricmc.fabric.impl.client.indigo.renderer.helper.ColorHelper;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.core.Registry;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.server.packs.resources.Resource;
|
||||
import net.minecraft.server.packs.resources.ResourceManager;
|
||||
import net.minecraft.util.Mth;
|
||||
import net.minecraft.world.item.BlockItem;
|
||||
import net.minecraft.world.item.Item;
|
||||
import ru.betterend.BetterEnd;
|
||||
|
||||
@Environment(EnvType.CLIENT)
|
||||
public class ColorUtil {
|
||||
|
||||
private static float[] floatBuffer = new float[4];
|
||||
|
||||
public static int[] toIntArray(int color) {
|
||||
return new int[] {
|
||||
(color >> 24) & 255,
|
||||
(color >> 16) & 255,
|
||||
(color >> 8) & 255,
|
||||
color & 255
|
||||
};
|
||||
}
|
||||
|
||||
public static float[] toFloatArray(int color) {
|
||||
floatBuffer[0] = ((color >> 16 & 255) / 255.0F);
|
||||
floatBuffer[1] = ((color >> 8 & 255) / 255.0F);
|
||||
floatBuffer[2] = ((color & 255) / 255.0F);
|
||||
floatBuffer[3] = ((color >> 24 & 255) / 255.0F);
|
||||
|
||||
return floatBuffer;
|
||||
}
|
||||
|
||||
public static float[] RGBtoHSB(int r, int g, int b, float[] hsbvals) {
|
||||
float hue, saturation, brightness;
|
||||
if (hsbvals == null) {
|
||||
hsbvals = floatBuffer;
|
||||
}
|
||||
int cmax = (r > g) ? r : g;
|
||||
if (b > cmax) cmax = b;
|
||||
int cmin = (r < g) ? r : g;
|
||||
if (b < cmin) cmin = b;
|
||||
|
||||
brightness = ((float) cmax) / 255.0F;
|
||||
if (cmax != 0)
|
||||
saturation = ((float) (cmax - cmin)) / ((float) cmax);
|
||||
else
|
||||
saturation = 0;
|
||||
if (saturation == 0)
|
||||
hue = 0;
|
||||
else {
|
||||
float redc = ((float) (cmax - r)) / ((float) (cmax - cmin));
|
||||
float greenc = ((float) (cmax - g)) / ((float) (cmax - cmin));
|
||||
float bluec = ((float) (cmax - b)) / ((float) (cmax - cmin));
|
||||
if (r == cmax)
|
||||
hue = bluec - greenc;
|
||||
else if (g == cmax)
|
||||
hue = 2.0F + redc - bluec;
|
||||
else
|
||||
hue = 4.0F + greenc - redc;
|
||||
hue = hue / 6.0F;
|
||||
if (hue < 0)
|
||||
hue = hue + 1.0F;
|
||||
}
|
||||
hsbvals[0] = hue;
|
||||
hsbvals[1] = saturation;
|
||||
hsbvals[2] = brightness;
|
||||
return hsbvals;
|
||||
}
|
||||
|
||||
public static int HSBtoRGB(float hue, float saturation, float brightness) {
|
||||
int r = 0, g = 0, b = 0;
|
||||
if (saturation == 0) {
|
||||
r = g = b = (int) (brightness * 255.0F + 0.5F);
|
||||
} else {
|
||||
float h = (hue - (float)Math.floor(hue)) * 6.0F;
|
||||
float f = h - (float)java.lang.Math.floor(h);
|
||||
float p = brightness * (1.0F - saturation);
|
||||
float q = brightness * (1.0F - saturation * f);
|
||||
float t = brightness * (1.0F - (saturation * (1.0F - f)));
|
||||
switch ((int) h) {
|
||||
case 0:
|
||||
r = (int) (brightness * 255.0F + 0.5F);
|
||||
g = (int) (t * 255.0F + 0.5F);
|
||||
b = (int) (p * 255.0F + 0.5F);
|
||||
break;
|
||||
case 1:
|
||||
r = (int) (q * 255.0F + 0.5F);
|
||||
g = (int) (brightness * 255.0F + 0.5F);
|
||||
b = (int) (p * 255.0F + 0.5F);
|
||||
break;
|
||||
case 2:
|
||||
r = (int) (p * 255.0F + 0.5F);
|
||||
g = (int) (brightness * 255.0F + 0.5F);
|
||||
b = (int) (t * 255.0F + 0.5F);
|
||||
break;
|
||||
case 3:
|
||||
r = (int) (p * 255.0F + 0.5F);
|
||||
g = (int) (q * 255.0F + 0.5F);
|
||||
b = (int) (brightness * 255.0F + 0.5F);
|
||||
break;
|
||||
case 4:
|
||||
r = (int) (t * 255.0F + 0.5F);
|
||||
g = (int) (p * 255.0F + 0.5F);
|
||||
b = (int) (brightness * 255.0F + 0.5F);
|
||||
break;
|
||||
case 5:
|
||||
r = (int) (brightness * 255.0F + 0.5F);
|
||||
g = (int) (p * 255.0F + 0.5F);
|
||||
b = (int) (q * 255.0F + 0.5F);
|
||||
break;
|
||||
}
|
||||
}
|
||||
return 0xFF000000 | (r << 16) | (g << 8) | (b << 0);
|
||||
}
|
||||
|
||||
public static int parseHex(String hexColor) {
|
||||
int len = hexColor.length();
|
||||
if (len < 6 || len > 8 || len % 2 > 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
int color, shift;
|
||||
if(len == 6) {
|
||||
color = 0xFF000000; shift = 16;
|
||||
} else {
|
||||
color = 0; shift = 24;
|
||||
}
|
||||
|
||||
try {
|
||||
String[] splited = hexColor.split("(?<=\\G.{2})");
|
||||
for (String digit : splited) {
|
||||
color |= Integer.valueOf(digit, 16) << shift;
|
||||
shift -= 8;
|
||||
}
|
||||
} catch(NumberFormatException ex) {
|
||||
BetterEnd.LOGGER.catching(ex);
|
||||
return -1;
|
||||
}
|
||||
|
||||
return color;
|
||||
}
|
||||
|
||||
public static int toABGR(int color) {
|
||||
int r = (color >> 16) & 255;
|
||||
int g = (color >> 8) & 255;
|
||||
int b = color & 255;
|
||||
return 0xFF000000 | b << 16 | g << 8 | r;
|
||||
}
|
||||
|
||||
public static int ABGRtoARGB(int color) {
|
||||
int a = (color >> 24) & 255;
|
||||
int b = (color >> 16) & 255;
|
||||
int g = (color >> 8) & 255;
|
||||
int r = color & 255;
|
||||
return a << 24 | r << 16 | g << 8 | b;
|
||||
}
|
||||
|
||||
public static int colorBrigtness(int color, float val) {
|
||||
RGBtoHSB((color >> 16) & 255, (color >> 8) & 255, color & 255, floatBuffer);
|
||||
floatBuffer[2] += val / 10.0F;
|
||||
floatBuffer[2] = Mth.clamp(floatBuffer[2], 0.0F, 1.0F);
|
||||
return HSBtoRGB(floatBuffer[0], floatBuffer[1], floatBuffer[2]);
|
||||
}
|
||||
|
||||
public static int applyTint(int color, int tint) {
|
||||
return colorBrigtness(ColorHelper.multiplyColor(color, tint), 1.5F);
|
||||
}
|
||||
|
||||
public static int colorDistance(int color1, int color2) {
|
||||
int r1 = (color1 >> 16) & 255;
|
||||
int g1 = (color1 >> 8) & 255;
|
||||
int b1 = color1 & 255;
|
||||
int r2 = (color2 >> 16) & 255;
|
||||
int g2 = (color2 >> 8) & 255;
|
||||
int b2 = color2 & 255;
|
||||
return MHelper.pow2(r1 - r2) + MHelper.pow2(g1 - g2) + MHelper.pow2(b1 - b2);
|
||||
}
|
||||
|
||||
private static Map<ResourceLocation, Integer> colorPalette = Maps.newHashMap();
|
||||
|
||||
public static int extractColor(Item item) {
|
||||
ResourceLocation id = Registry.ITEM.getKey(item);
|
||||
if (id.equals(Registry.ITEM.getDefaultKey())) return -1;
|
||||
if (colorPalette.containsKey(id)) {
|
||||
return colorPalette.get(id);
|
||||
}
|
||||
ResourceLocation texture;
|
||||
if (item instanceof BlockItem) {
|
||||
texture = new ResourceLocation(id.getNamespace(), "textures/block/" + id.getPath() + ".png");
|
||||
} else {
|
||||
texture = new ResourceLocation(id.getNamespace(), "textures/item/" + id.getPath() + ".png");
|
||||
}
|
||||
NativeImage image = loadImage(texture, 16, 16);
|
||||
List<Integer> colors = new ArrayList<>();
|
||||
for (int i = 0; i < image.getWidth(); i++) {
|
||||
for (int j = 0; j < 16; j++) {
|
||||
int col = image.getPixelRGBA(i, j);
|
||||
if (((col >> 24) & 255) > 0) {
|
||||
colors.add(ABGRtoARGB(col));
|
||||
}
|
||||
}
|
||||
}
|
||||
image.close();
|
||||
|
||||
if (colors.size() == 0) return -1;
|
||||
|
||||
ColorExtractor extractor = new ColorExtractor(colors);
|
||||
int color = extractor.analize();
|
||||
colorPalette.put(id, color);
|
||||
|
||||
return color;
|
||||
}
|
||||
|
||||
public static NativeImage loadImage(ResourceLocation image, int w, int h) {
|
||||
Minecraft minecraft = Minecraft.getInstance();
|
||||
ResourceManager resourceManager = minecraft.getResourceManager();
|
||||
if (resourceManager.hasResource(image)) {
|
||||
try (Resource resource = resourceManager.getResource(image)) {
|
||||
return NativeImage.read(resource.getInputStream());
|
||||
} catch (IOException e) {
|
||||
BetterEnd.LOGGER.warning("Can't load texture image: {}. Will be created empty image.", image);
|
||||
BetterEnd.LOGGER.warning("Cause: {}.", e.getMessage());
|
||||
}
|
||||
}
|
||||
return new NativeImage(w, h, false);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,369 +0,0 @@
|
|||
package ru.betterend.util;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import com.mojang.math.Vector3f;
|
||||
|
||||
import net.minecraft.core.Vec3i;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
|
||||
public class MHelper {
|
||||
public static final float PI2 = (float) (Math.PI * 2);
|
||||
private static final int ALPHA = 255 << 24;
|
||||
public static final Random RANDOM = new Random();
|
||||
private static final float RAD_TO_DEG = 57.295779513082320876798154814105F;
|
||||
public static final float PHI = (float) (Math.PI * (3 - Math.sqrt(5)));
|
||||
private static final Vec3i[] RANDOM_OFFSETS = new Vec3i[3 * 3 * 3 - 1];
|
||||
|
||||
public static int color(int r, int g, int b) {
|
||||
return ALPHA | (r << 16) | (g << 8) | b;
|
||||
}
|
||||
|
||||
public static int color(String hex) {
|
||||
int r = Integer.parseInt(hex.substring(0, 2), 16);
|
||||
int g = Integer.parseInt(hex.substring(2, 4), 16);
|
||||
int b = Integer.parseInt(hex.substring(4, 6), 16);
|
||||
return color(r, g, b);
|
||||
}
|
||||
|
||||
public static int randRange(int min, int max, Random random) {
|
||||
return min + random.nextInt(max - min + 1);
|
||||
}
|
||||
|
||||
public static double randRange(double min, double max, Random random) {
|
||||
return min + random.nextDouble() * (max - min);
|
||||
}
|
||||
|
||||
public static float randRange(float min, float max, Random random) {
|
||||
return min + random.nextFloat() * (max - min);
|
||||
}
|
||||
|
||||
public static byte setBit(byte source, int pos, boolean value) {
|
||||
return value ? setBitTrue(source, pos) : setBitFalse(source, pos);
|
||||
}
|
||||
|
||||
public static byte setBitTrue(byte source, int pos) {
|
||||
source |= 1 << pos;
|
||||
return source;
|
||||
}
|
||||
|
||||
public static byte setBitFalse(byte source, int pos) {
|
||||
source &= ~(1 << pos);
|
||||
return source;
|
||||
}
|
||||
|
||||
public static boolean getBit(byte source, int pos) {
|
||||
return ((source >> pos) & 1) == 1;
|
||||
}
|
||||
|
||||
public static int floor(float x) {
|
||||
return x < 0 ? (int) (x - 1) : (int) x;
|
||||
}
|
||||
|
||||
public static float wrap(float x, float side) {
|
||||
return x - floor(x / side) * side;
|
||||
}
|
||||
|
||||
public static int floor(double x) {
|
||||
return x < 0 ? (int) (x - 1) : (int) x;
|
||||
}
|
||||
|
||||
public static int min(int a, int b) {
|
||||
return a < b ? a : b;
|
||||
}
|
||||
|
||||
public static int min(int a, int b, int c) {
|
||||
return min(a, min(b, c));
|
||||
}
|
||||
|
||||
public static int max(int a, int b) {
|
||||
return a > b ? a : b;
|
||||
}
|
||||
|
||||
public static float min(float a, float b) {
|
||||
return a < b ? a : b;
|
||||
}
|
||||
|
||||
public static float max(float a, float b) {
|
||||
return a > b ? a : b;
|
||||
}
|
||||
|
||||
public static float max(float a, float b, float c) {
|
||||
return max(a, max(b, c));
|
||||
}
|
||||
|
||||
public static int max(int a, int b, int c) {
|
||||
return max(a, max(b, c));
|
||||
}
|
||||
|
||||
public static boolean isEven(int num) {
|
||||
return (num & 1) == 0;
|
||||
}
|
||||
|
||||
public static float lengthSqr(float x, float y, float z) {
|
||||
return x * x + y * y + z * z;
|
||||
}
|
||||
|
||||
public static double lengthSqr(double x, double y, double z) {
|
||||
return x * x + y * y + z * z;
|
||||
}
|
||||
|
||||
public static float length(float x, float y, float z) {
|
||||
return (float) Math.sqrt(lengthSqr(x, y, z));
|
||||
}
|
||||
|
||||
public static double length(double x, double y, double z) {
|
||||
return Math.sqrt(lengthSqr(x, y, z));
|
||||
}
|
||||
|
||||
public static float lengthSqr(float x, float y) {
|
||||
return x * x + y * y;
|
||||
}
|
||||
|
||||
public static double lengthSqr(double x, double y) {
|
||||
return x * x + y * y;
|
||||
}
|
||||
|
||||
public static float length(float x, float y) {
|
||||
return (float) Math.sqrt(lengthSqr(x, y));
|
||||
}
|
||||
|
||||
public static double length(double x, double y) {
|
||||
return Math.sqrt(lengthSqr(x, y));
|
||||
}
|
||||
|
||||
public static float dot(float x1, float y1, float z1, float x2, float y2, float z2) {
|
||||
return x1 * x2 + y1 * y2 + z1 * z2;
|
||||
}
|
||||
|
||||
public static float dot(float x1, float y1, float x2, float y2) {
|
||||
return x1 * x2 + y1 * y2;
|
||||
}
|
||||
|
||||
public static int getRandom(int x, int z) {
|
||||
int h = x * 374761393 + z * 668265263;
|
||||
h = (h ^ (h >> 13)) * 1274126177;
|
||||
return h ^ (h >> 16);
|
||||
}
|
||||
|
||||
public static int getSeed(int seed, int x, int y) {
|
||||
int h = seed + x * 374761393 + y * 668265263;
|
||||
h = (h ^ (h >> 13)) * 1274126177;
|
||||
return h ^ (h >> 16);
|
||||
}
|
||||
|
||||
public static int getSeed(int seed, int x, int y, int z) {
|
||||
int h = seed + x * 374761393 + y * 668265263 + z;
|
||||
h = (h ^ (h >> 13)) * 1274126177;
|
||||
return h ^ (h >> 16);
|
||||
}
|
||||
|
||||
public static <T> void shuffle(T[] array, Random random) {
|
||||
for (int i = 0; i < array.length; i++) {
|
||||
int i2 = random.nextInt(array.length);
|
||||
T element = array[i];
|
||||
array[i] = array[i2];
|
||||
array[i2] = element;
|
||||
}
|
||||
}
|
||||
|
||||
public static int pow2(int i) {
|
||||
return i * i;
|
||||
}
|
||||
|
||||
public static float pow2(float f) {
|
||||
return f * f;
|
||||
}
|
||||
|
||||
public static double pow2(double d) {
|
||||
return d * d;
|
||||
}
|
||||
|
||||
public static int fromHSBtoRGB(float hue, float saturation, float brightness) {
|
||||
int red = 0;
|
||||
int green = 0;
|
||||
int blue = 0;
|
||||
if (saturation == 0.0F) {
|
||||
red = green = blue = (int) (brightness * 255.0F + 0.5F);
|
||||
} else {
|
||||
float var6 = (hue - (float) Math.floor((double) hue)) * 6.0F;
|
||||
float var7 = var6 - (float) Math.floor((double) var6);
|
||||
float var8 = brightness * (1.0F - saturation);
|
||||
float var9 = brightness * (1.0F - saturation * var7);
|
||||
float var10 = brightness * (1.0F - saturation * (1.0F - var7));
|
||||
switch ((int) var6) {
|
||||
case 0 :
|
||||
red = (int) (brightness * 255.0F + 0.5F);
|
||||
green = (int) (var10 * 255.0F + 0.5F);
|
||||
blue = (int) (var8 * 255.0F + 0.5F);
|
||||
break;
|
||||
case 1 :
|
||||
red = (int) (var9 * 255.0F + 0.5F);
|
||||
green = (int) (brightness * 255.0F + 0.5F);
|
||||
blue = (int) (var8 * 255.0F + 0.5F);
|
||||
break;
|
||||
case 2 :
|
||||
red = (int) (var8 * 255.0F + 0.5F);
|
||||
green = (int) (brightness * 255.0F + 0.5F);
|
||||
blue = (int) (var10 * 255.0F + 0.5F);
|
||||
break;
|
||||
case 3 :
|
||||
red = (int) (var8 * 255.0F + 0.5F);
|
||||
green = (int) (var9 * 255.0F + 0.5F);
|
||||
blue = (int) (brightness * 255.0F + 0.5F);
|
||||
break;
|
||||
case 4 :
|
||||
red = (int) (var10 * 255.0F + 0.5F);
|
||||
green = (int) (var8 * 255.0F + 0.5F);
|
||||
blue = (int) (brightness * 255.0F + 0.5F);
|
||||
break;
|
||||
case 5 :
|
||||
red = (int) (brightness * 255.0F + 0.5F);
|
||||
green = (int) (var8 * 255.0F + 0.5F);
|
||||
blue = (int) (var9 * 255.0F + 0.5F);
|
||||
}
|
||||
}
|
||||
|
||||
return ALPHA | red << 16 | green << 8 | blue;
|
||||
}
|
||||
|
||||
public static float[] fromRGBtoHSB(int r, int g, int b) {
|
||||
float[] values = new float[3];
|
||||
|
||||
int max = max(r, g, b);
|
||||
int min = min(r, g, b);
|
||||
|
||||
float brightness = (float) max / 255.0F;
|
||||
float saturation;
|
||||
if (max != 0) {
|
||||
saturation = (float) (max - min) / (float) max;
|
||||
} else {
|
||||
saturation = 0.0F;
|
||||
}
|
||||
|
||||
float hue;
|
||||
if (saturation == 0.0F) {
|
||||
hue = 0.0F;
|
||||
}
|
||||
else {
|
||||
float var9 = (float) (max - r) / (float) (max - min);
|
||||
float var10 = (float) (max - g) / (float) (max - min);
|
||||
float var11 = (float) (max - b) / (float) (max - min);
|
||||
if (r == max) {
|
||||
hue = var11 - var10;
|
||||
} else if (g == max) {
|
||||
hue = 2.0F + var9 - var11;
|
||||
} else {
|
||||
hue = 4.0F + var10 - var9;
|
||||
}
|
||||
|
||||
hue /= 6.0F;
|
||||
if (hue < 0.0F) {
|
||||
++hue;
|
||||
}
|
||||
}
|
||||
|
||||
values[0] = hue;
|
||||
values[1] = saturation;
|
||||
values[2] = brightness;
|
||||
|
||||
return values;
|
||||
}
|
||||
|
||||
public static Vec3 fromRGBtoHSBV(int r, int g, int b) {
|
||||
int max = max(r, g, b);
|
||||
int min = min(r, g, b);
|
||||
|
||||
float brightness = (float) max / 255.0F;
|
||||
float saturation;
|
||||
if (max != 0) {
|
||||
saturation = (float) (max - min) / (float) max;
|
||||
} else {
|
||||
saturation = 0.0F;
|
||||
}
|
||||
|
||||
float hue;
|
||||
if (saturation == 0.0F) {
|
||||
hue = 0.0F;
|
||||
}
|
||||
else {
|
||||
float var9 = (float) (max - r) / (float) (max - min);
|
||||
float var10 = (float) (max - g) / (float) (max - min);
|
||||
float var11 = (float) (max - b) / (float) (max - min);
|
||||
if (r == max) {
|
||||
hue = var11 - var10;
|
||||
} else if (g == max) {
|
||||
hue = 2.0F + var9 - var11;
|
||||
} else {
|
||||
hue = 4.0F + var10 - var9;
|
||||
}
|
||||
|
||||
hue /= 6.0F;
|
||||
if (hue < 0.0F) {
|
||||
++hue;
|
||||
}
|
||||
}
|
||||
|
||||
return new Vec3(hue, saturation, brightness);
|
||||
}
|
||||
|
||||
public static final float radiansToDegrees(float value) {
|
||||
return value * RAD_TO_DEG;
|
||||
}
|
||||
|
||||
public static final float degreesToRadians(float value) {
|
||||
return value / RAD_TO_DEG;
|
||||
}
|
||||
|
||||
public static Vector3f cross(Vector3f vec1, Vector3f vec2)
|
||||
{
|
||||
float cx = vec1.y() * vec2.z() - vec1.z() * vec2.y();
|
||||
float cy = vec1.z() * vec2.x() - vec1.x() * vec2.z();
|
||||
float cz = vec1.x() * vec2.y() - vec1.y() * vec2.x();
|
||||
return new Vector3f(cx, cy, cz);
|
||||
}
|
||||
|
||||
public static Vector3f normalize(Vector3f vec) {
|
||||
float length = lengthSqr(vec.x(), vec.y(), vec.z());
|
||||
if (length > 0) {
|
||||
length = (float) Math.sqrt(length);
|
||||
float x = vec.x() / length;
|
||||
float y = vec.y() / length;
|
||||
float z = vec.z() / length;
|
||||
vec.set(x, y, z);
|
||||
}
|
||||
return vec;
|
||||
}
|
||||
|
||||
public static float angle(Vector3f vec1, Vector3f vec2) {
|
||||
float dot = vec1.x() * vec2.x() + vec1.y() * vec2.y() + vec1.z() * vec2.z();
|
||||
float length1 = lengthSqr(vec1.x(), vec1.y(), vec1.z());
|
||||
float length2 = lengthSqr(vec2.x(), vec2.y(), vec2.z());
|
||||
return (float) Math.acos(dot / Math.sqrt(length1 * length2));
|
||||
}
|
||||
|
||||
public static Vector3f randomHorizontal(Random random) {
|
||||
float angleY = MHelper.randRange(0, MHelper.PI2, random);
|
||||
float vx = (float) Math.sin(angleY);
|
||||
float vz = (float) Math.cos(angleY);
|
||||
return new Vector3f(vx, 0, vz);
|
||||
}
|
||||
|
||||
public static Vec3i[] getOffsets(Random random) {
|
||||
MHelper.shuffle(RANDOM_OFFSETS, random);
|
||||
return RANDOM_OFFSETS;
|
||||
}
|
||||
|
||||
static {
|
||||
int index = 0;
|
||||
for (int x = -1; x <= 1; x++) {
|
||||
for (int y = -1; y <= 1; y++) {
|
||||
for (int z = -1; z <= 1; z++) {
|
||||
if (x != 0 || y != 0 || z != 0) {
|
||||
RANDOM_OFFSETS[index++] = new Vec3i(x, y, z);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -13,6 +13,7 @@ import net.minecraft.core.BlockPos.MutableBlockPos;
|
|||
import net.minecraft.util.Mth;
|
||||
import net.minecraft.world.level.WorldGenLevel;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import ru.bclib.util.MHelper;
|
||||
import ru.betterend.util.sdf.SDF;
|
||||
import ru.betterend.util.sdf.operator.SDFUnion;
|
||||
import ru.betterend.util.sdf.primitive.SDFLine;
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ import net.minecraft.world.level.levelgen.structure.BoundingBox;
|
|||
import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings;
|
||||
import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
|
||||
import net.minecraft.world.level.material.Material;
|
||||
import ru.bclib.util.MHelper;
|
||||
import ru.betterend.registry.EndBlocks;
|
||||
import ru.betterend.registry.EndTags;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package ru.betterend.util.sdf.operator;
|
||||
|
||||
import ru.betterend.util.MHelper;
|
||||
import ru.bclib.util.MHelper;
|
||||
|
||||
public class SDFCopyRotate extends SDFUnary {
|
||||
int count = 1;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package ru.betterend.util.sdf.operator;
|
||||
|
||||
import ru.betterend.util.MHelper;
|
||||
import ru.bclib.util.MHelper;
|
||||
|
||||
public class SDFIntersection extends SDFBinary {
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
package ru.betterend.util.sdf.operator;
|
||||
|
||||
import net.minecraft.util.Mth;
|
||||
import ru.bclib.util.MHelper;
|
||||
import ru.betterend.noise.OpenSimplexNoise;
|
||||
import ru.betterend.util.MHelper;
|
||||
|
||||
public class SDFRadialNoiseMap extends SDFDisplacement {
|
||||
private static final float SIN = Mth.sin(0.5F);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package ru.betterend.util.sdf.operator;
|
||||
|
||||
import ru.betterend.util.MHelper;
|
||||
import ru.bclib.util.MHelper;
|
||||
|
||||
public class SDFSubtraction extends SDFBinary {
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package ru.betterend.util.sdf.operator;
|
||||
|
||||
import ru.betterend.util.MHelper;
|
||||
import ru.bclib.util.MHelper;
|
||||
|
||||
public class SDFUnion extends SDFBinary {
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package ru.betterend.util.sdf.primitive;
|
||||
|
||||
import net.minecraft.util.Mth;
|
||||
import ru.betterend.util.MHelper;
|
||||
import ru.bclib.util.MHelper;
|
||||
|
||||
public class SDFCappedCone extends SDFPrimitive {
|
||||
private float radius1;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package ru.betterend.util.sdf.primitive;
|
||||
|
||||
import net.minecraft.util.Mth;
|
||||
import ru.betterend.util.MHelper;
|
||||
import ru.bclib.util.MHelper;
|
||||
|
||||
public class SDFCapsule extends SDFPrimitive {
|
||||
private float radius;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package ru.betterend.util.sdf.primitive;
|
||||
|
||||
import ru.betterend.util.MHelper;
|
||||
import ru.bclib.util.MHelper;
|
||||
|
||||
public class SDFHexPrism extends SDFPrimitive {
|
||||
private float radius;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package ru.betterend.util.sdf.primitive;
|
||||
|
||||
import net.minecraft.util.Mth;
|
||||
import ru.betterend.util.MHelper;
|
||||
import ru.bclib.util.MHelper;
|
||||
|
||||
public class SDFLine extends SDFPrimitive {
|
||||
private float radius;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package ru.betterend.util.sdf.primitive;
|
||||
|
||||
import net.minecraft.util.Mth;
|
||||
import ru.betterend.util.MHelper;
|
||||
import ru.bclib.util.MHelper;
|
||||
|
||||
public class SDFPie extends SDFPrimitive {
|
||||
private float sin;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package ru.betterend.util.sdf.primitive;
|
||||
|
||||
import ru.betterend.util.MHelper;
|
||||
import ru.bclib.util.MHelper;
|
||||
|
||||
public class SDFSphere extends SDFPrimitive {
|
||||
private float radius;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue