From 07ff4e97c1ba53923919c189bea4ce0efb6c37a2 Mon Sep 17 00:00:00 2001 From: wizjany Date: Fri, 26 Apr 2019 15:08:50 -0400 Subject: [PATCH 1/5] Add logo to source. --- README.md | 2 +- worldedit-logo.png | Bin 0 -> 9124 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 worldedit-logo.png diff --git a/README.md b/README.md index 2cfef0034..6d9968e37 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![WorldEdit](http://static.sk89q.com/readme/worldedit.png) +![WorldEdit](worldedit-logo.png) ========= WorldEdit is Minecraft mod that turns Minecraft into an in-game map editor (sorta, kinda). diff --git a/worldedit-logo.png b/worldedit-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..e0b515743ce40641cfdc045b1bc0e9e28dc32fe2 GIT binary patch literal 9124 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 Date: Fri, 26 Apr 2019 21:48:03 -0400 Subject: [PATCH 2/5] Re-add 1.13 entity renames. Accidentally replaced the new ones with the old ones. This is why we need DFUs. --- .../extent/clipboard/io/MCEditSchematicReader.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/MCEditSchematicReader.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/MCEditSchematicReader.java index d21533e20..53ec62dae 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/MCEditSchematicReader.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/MCEditSchematicReader.java @@ -320,6 +320,18 @@ public class MCEditSchematicReader extends NBTSchematicReader { case "ThrownExpBottle": return "xp_bottle"; case "XPOrb": return "xp_orb"; case "PigZombie": return "zombie_pigman"; + case "xp_orb": return "experience_orb"; + case "xp_bottle": return "experience_bottle"; + case "eye_of_ender_signal": return "eye_of_ender"; + case "ender_crystal": return "end_crystal"; + case "fireworks_rocket": return "firework_rocket"; + case "commandblock_minecart": return "command_block_minecart"; + case "snowman": return "snow_golem"; + case "villager_golem": return "iron_golem"; + case "evocation_fangs": return "evoker_fangs"; + case "evocation_illager": return "evoker"; + case "vindication_illager": return "vindicator"; + case "illusion_illager": return "illusioner"; default: return id; } } From 484a1db500c18b747963cba6a222f52c6d593225 Mon Sep 17 00:00:00 2001 From: Kenzie Togami Date: Sat, 27 Apr 2019 13:37:43 -0700 Subject: [PATCH 3/5] Remove artifactory resolve block --- build.gradle | 9 --------- 1 file changed, 9 deletions(-) diff --git a/build.gradle b/build.gradle index 41de17bb8..8bdc30616 100644 --- a/build.gradle +++ b/build.gradle @@ -69,15 +69,6 @@ artifactory { ivy = false } } - - resolve { - repository { - repoKey = 'repo' - username = "${artifactory_user}" - password = "${artifactory_password}" - maven = true - } - } } artifactoryPublish.skip = true From f7670f7812d47868932a698bcca5a3c154089caa Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Sun, 28 Apr 2019 18:47:28 +1000 Subject: [PATCH 4/5] Temporary fix for forge having terrible classpath issues. --- .../worldedit/util/io/ResourceLoader.java | 43 +++++++++++++++++++ .../world/registry/BundledBlockData.java | 3 +- .../world/registry/BundledItemData.java | 3 +- .../world/registry/LegacyMapper.java | 3 +- 4 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 worldedit-core/src/main/java/com/sk89q/worldedit/util/io/ResourceLoader.java diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/io/ResourceLoader.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/io/ResourceLoader.java new file mode 100644 index 000000000..09ac4724f --- /dev/null +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/io/ResourceLoader.java @@ -0,0 +1,43 @@ +/* + * WorldEdit, a Minecraft world manipulation toolkit + * Copyright (C) sk89q + * Copyright (C) WorldEdit team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldedit.util.io; + +import java.io.IOException; +import java.net.URL; + +public class ResourceLoader { + + private ResourceLoader() { + } + + public static URL getResource(Class clazz, String name) throws IOException { + URL url = clazz.getResource(name); + if (url == null) { + try { + return new URL("modjar://worldedit/" + clazz.getName().substring(0, clazz.getName().lastIndexOf('.')).replace(".", "/") + "/" + + name); + } catch (Exception e) { + // Not forge. + } + throw new IOException("Could not find " + name); + } + return url; + } +} diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockData.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockData.java index 4dffdb38f..76cd902ef 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockData.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockData.java @@ -25,6 +25,7 @@ import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import com.sk89q.worldedit.math.Vector3; import com.sk89q.worldedit.util.gson.VectorAdapter; +import com.sk89q.worldedit.util.io.ResourceLoader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -74,7 +75,7 @@ public class BundledBlockData { GsonBuilder gsonBuilder = new GsonBuilder(); gsonBuilder.registerTypeAdapter(Vector3.class, new VectorAdapter()); Gson gson = gsonBuilder.create(); - URL url = BundledBlockData.class.getResource("blocks.json"); + URL url = ResourceLoader.getResource(BundledBlockData.class, "blocks.json"); if (url == null) { throw new IOException("Could not find blocks.json"); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemData.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemData.java index 4bdac0c8a..4e1af0422 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemData.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemData.java @@ -25,6 +25,7 @@ import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import com.sk89q.worldedit.math.Vector3; import com.sk89q.worldedit.util.gson.VectorAdapter; +import com.sk89q.worldedit.util.io.ResourceLoader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -74,7 +75,7 @@ public class BundledItemData { GsonBuilder gsonBuilder = new GsonBuilder(); gsonBuilder.registerTypeAdapter(Vector3.class, new VectorAdapter()); Gson gson = gsonBuilder.create(); - URL url = BundledItemData.class.getResource("items.json"); + URL url = ResourceLoader.getResource(BundledItemData.class,"items.json"); if (url == null) { throw new IOException("Could not find items.json"); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/LegacyMapper.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/LegacyMapper.java index a41814abc..05acbeb1d 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/LegacyMapper.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/LegacyMapper.java @@ -29,6 +29,7 @@ import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.extension.input.ParserContext; import com.sk89q.worldedit.math.Vector3; import com.sk89q.worldedit.util.gson.VectorAdapter; +import com.sk89q.worldedit.util.io.ResourceLoader; import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.item.ItemType; import com.sk89q.worldedit.world.item.ItemTypes; @@ -74,7 +75,7 @@ public class LegacyMapper { GsonBuilder gsonBuilder = new GsonBuilder(); gsonBuilder.registerTypeAdapter(Vector3.class, new VectorAdapter()); Gson gson = gsonBuilder.disableHtmlEscaping().create(); - URL url = LegacyMapper.class.getResource("legacy.json"); + URL url = ResourceLoader.getResource(LegacyMapper.class, "legacy.json"); if (url == null) { throw new IOException("Could not find legacy.json"); } From d48702aad69523ef580d0133eead374d39a4a2a0 Mon Sep 17 00:00:00 2001 From: wizjany Date: Sun, 28 Apr 2019 10:56:21 -0400 Subject: [PATCH 5/5] Fix schematic id conversion for entities with multiple renames. --- .../clipboard/io/MCEditSchematicReader.java | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/MCEditSchematicReader.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/MCEditSchematicReader.java index 53ec62dae..71005ad00 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/MCEditSchematicReader.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/MCEditSchematicReader.java @@ -287,13 +287,10 @@ public class MCEditSchematicReader extends NBTSchematicReader { case "ArmorStand": return "armor_stand"; case "CaveSpider": return "cave_spider"; case "MinecartChest": return "chest_minecart"; - case "MinecartCommandBlock": return "commandblock_minecart"; case "DragonFireball": return "dragon_fireball"; case "ThrownEgg": return "egg"; - case "EnderCrystal": return "ender_crystal"; case "EnderDragon": return "ender_dragon"; case "ThrownEnderpearl": return "ender_pearl"; - case "EyeOfEnderSignal": return "eye_of_ender_signal"; case "FallingSand": return "falling_block"; case "FireworksRocketEntity": return "fireworks_rocket"; case "MinecartFurnace": return "furnace_minecart"; @@ -317,15 +314,23 @@ public class MCEditSchematicReader extends NBTSchematicReader { case "VillagerGolem": return "villager_golem"; case "WitherBoss": return "wither"; case "WitherSkull": return "wither_skull"; - case "ThrownExpBottle": return "xp_bottle"; - case "XPOrb": return "xp_orb"; case "PigZombie": return "zombie_pigman"; - case "xp_orb": return "experience_orb"; - case "xp_bottle": return "experience_bottle"; - case "eye_of_ender_signal": return "eye_of_ender"; - case "ender_crystal": return "end_crystal"; + case "XPOrb": + case "xp_orb": + return "experience_orb"; + case "ThrownExpBottle": + case "xp_bottle": + return "experience_bottle"; + case "EyeOfEnderSignal": + case "eye_of_ender_signal": + return "eye_of_ender"; + case "EnderCrystal": + case "ender_crystal": + return "end_crystal"; case "fireworks_rocket": return "firework_rocket"; - case "commandblock_minecart": return "command_block_minecart"; + case "MinecartCommandBlock": + case "commandblock_minecart": + return "command_block_minecart"; case "snowman": return "snow_golem"; case "villager_golem": return "iron_golem"; case "evocation_fangs": return "evoker_fangs";