Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix persistent brushes

Browse Source
This commit is contained in:
Jesse Boyd 2018-08-24 07:18:14 +10:00
parent dbd31ea347
commit c3db5c0cf1
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
10 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
worldedit-bukkit/build.gradle
View File

@ -35,14 +35,12 @@ dependencies {
processResources {
from (sourceSets.main.resources.srcDirs) {
expand 'version': project.internalVersion
expand 'internalVersion': project.internalVersion
include 'plugin.yml'
include 'fawe.properties'
}
from (sourceSets.main.resources.srcDirs) {
exclude 'plugin.yml'
exclude 'fawe.properties'
}
}

2
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/util/ItemUtil.java
View File

@ -47,6 +47,8 @@ public class ItemUtil {
return null;
}
public CompoundTag getNBT(ItemStack item) {
try {
if (!item.hasItemMeta()) return null;

5
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java
View File

@ -349,9 +349,7 @@ public class BukkitAdapter {
*/
public static BaseItemStack adapt(ItemStack itemStack) {
checkNotNull(itemStack);
return new BaseItemStack(ItemTypes.get(itemStack.getType().getKey().toString()), itemStack.getAmount());
return new BukkitItemStack(itemStack);
}
/**
@ -362,6 +360,7 @@ public class BukkitAdapter {
*/
public static ItemStack adapt(BaseItemStack item) {
checkNotNull(item);
if (item instanceof BukkitItemStack) return ((BukkitItemStack) item).getBukkitItemStack();
return new ItemStack(adapt(item.getType()), item.getAmount());
}

20
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitItemStack.java
View File

@ -13,6 +13,7 @@ import javax.annotation.Nullable;
public class BukkitItemStack extends BaseItemStack {
private ItemStack stack;
private Object nativeItem;
private boolean loadedNBT;
public BukkitItemStack(ItemStack stack) {
@ -33,7 +34,23 @@ public class BukkitItemStack extends BaseItemStack {
@Nullable
@Override
public Object getNativeItem() {
return super.getNativeItem();
ItemUtil util = Fawe.<FaweBukkit>imp().getItemUtil();
if (util != null && nativeItem == null) {
return nativeItem = util.getNMSItem(stack);
}
return nativeItem;
}
public ItemStack getBukkitItemStack() {
return stack;
}
@Override
public boolean hasNbtData() {
if (!loadedNBT) {
return stack.hasItemMeta();
}
return super.hasNbtData();
}
@Nullable
@ -54,6 +71,7 @@ public class BukkitItemStack extends BaseItemStack {
ItemUtil util = Fawe.<FaweBukkit>imp().getItemUtil();
if (util != null) {
stack = util.setNBT(stack, nbtData);
nativeItem = null;
}
super.setNbtData(nbtData);
}

2
worldedit-bukkit/src/main/resources/plugin.yml
View File

@ -1,6 +1,6 @@
name: WorldEdit
main: com.sk89q.worldedit.bukkit.WorldEditPlugin
version: "${version}"
version: "${internalVersion}"
api-version: 1.13
description: Fast Async WorldEdit plugin
authors: [Empire92]

2
worldedit-core/build.gradle
View File

@ -37,7 +37,7 @@ processResources {
from('src/main/resources') {
include 'fawe.properties'
expand(
version: "${project.parent.version}",
internalVersion: "${project.parent.version}",
name: project.parent.name,
)
}

4
worldedit-core/src/main/java/com/boydti/fawe/util/BrushCache.java
View File

@ -38,7 +38,9 @@ public final class BrushCache {
BrushTool cached = brushCache.get(key);
if (cached != null) return cached;
StringTag json = (StringTag) item.getNbtData().getValue().get("weBrushJson");
CompoundTag nbt = item.getNbtData();
if (nbt == null) return null;
StringTag json = (StringTag) nbt.getValue().get("weBrushJson");
if (json != null) {
try {
if (RECURSION.get() != null) return null;

4
worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java
View File

@ -957,7 +957,7 @@ public class LocalSession implements TextureHolder {
}
public Tool getTool(BaseItem item, Player player) {
if (item.getNativeItem() != null && Settings.IMP.EXPERIMENTAL.PERSISTENT_BRUSHES) {
if (Settings.IMP.EXPERIMENTAL.PERSISTENT_BRUSHES && item.getNativeItem() != null) {
BrushTool tool = BrushCache.getTool(player, this, item);
if (tool != null) return tool;
}
@ -1034,7 +1034,7 @@ public class LocalSession implements TextureHolder {
throw new InvalidToolBindException(type, "Already used for the navigation wand");
}
Tool previous;
if (player != null && (tool instanceof BrushTool || tool == null) && item.getNativeItem() != null && Settings.IMP.EXPERIMENTAL.PERSISTENT_BRUSHES) {
if (player != null && (tool instanceof BrushTool || tool == null) && Settings.IMP.EXPERIMENTAL.PERSISTENT_BRUSHES && item.getNativeItem() != null) {
previous = BrushCache.getCachedTool(item);
if (tool != null) {
BrushCache.setTool(item, (BrushTool) tool);

4
worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
View File

@ -168,8 +168,8 @@ public class SchematicCommands extends MethodCommands {
@Command(
aliases = {"remap"},
help = "Remap a clipboard between MCPE/PC values\n",
desc = "Remap a clipboard between MCPE/PC values\n"
help = "Remap a clipboard between MCPE/PC values",
desc = "Remap a clipboard between MCPE/PC values"
)
@Deprecated
@CommandPermissions({"worldedit.schematic.remap"})

2
worldedit-core/src/main/resources/fawe.properties
View File

@ -1 +1 @@
version=${version}
version=${internalVersion}