Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-10 17:58:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix //image ane image brush

Browse Source 
fixes #208 and fixes #698
This commit is contained in:
dordsor21
2020-12-17 20:19:54 +00:00
parent 94a14b03b6
commit d379b0af9b
4 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
worldedit-core/src/main/java/com/boydti/fawe/util/RandomTextureUtil.java
View File

@ -1,5 +1,6 @@
package com.boydti.fawe.util;
import com.plotsquared.core.util.PseudoRandom;
import com.sk89q.worldedit.world.block.BlockType;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
@ -34,6 +35,8 @@ public class RandomTextureUtil extends CachedTextureUtil {
if (i < 0) {
int i1 = -i;
return -ThreadLocalRandom.current().nextInt(i1);
} else if( i == 0) {
return 0;
} else {
return ThreadLocalRandom.current().nextInt(i);
}

10
worldedit-core/src/main/java/com/boydti/fawe/util/TextureUtil.java
View File

@ -629,7 +629,6 @@ public class TextureUtil implements TextureHolder {
mods.add(modId);
}
}
continue;
}
String modelsDir = "assets/%1$s/models/block/%2$s.json";
String texturesDir = "assets/%1$s/textures/%2$s.png";
@ -638,14 +637,14 @@ public class TextureUtil implements TextureHolder {
}.getType();
for (BlockType blockType : BlockTypesCache.values) {
if (!blockType.getMaterial().isFullCube()) {
if (!blockType.getMaterial().isFullCube() || blockType.getId().toLowerCase().contains("shulker")) {
continue;
}
int combined = blockType.getInternalId();
String id = blockType.getId();
String[] split = id.split(":", 2);
String name = split.length == 1 ? id : split[1];
String nameSpace = split.length == 1 ? "minecraft" : split[0];
String nameSpace = split.length == 1 ? "" : split[0];
Map<String, String> texturesMap = new ConcurrentHashMap<>();
// Read models
@ -684,8 +683,11 @@ public class TextureUtil implements TextureHolder {
continue;
}
String[] texSplit = models.iterator().next().split(":");
String texture = texSplit[texSplit.length - 1];
textureFileName =
String.format(texturesDir, nameSpace, models.iterator().next());
String.format(texturesDir, nameSpace, texture);
}
BufferedImage image = readImage(zipFile, textureFileName);