Brandon
/
FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*

This commit is contained in:
Jesse Boyd 2017-10-14 20:14:27 +11:00
parent d93f9f0553
commit 4b9058bc7a
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/boydti/fawe/object/clipboard/remap/WikiScraper.java
View File

@ -81,8 +81,6 @@ public class WikiScraper {
int endIndex = text.indexOf(footer, headerIndex); int endIndex = text.indexOf(footer, headerIndex);
String part = text.substring(headerIndex, endIndex == -1 ? text.length() : endIndex); String part = text.substring(headerIndex, endIndex == -1 ? text.length() : endIndex);
// System.out.println(part);
for (String line : part.split("\n")) { for (String line : part.split("\n")) {
if (line.startsWith("| {{")) { if (line.startsWith("| {{")) {
String[] split = line.split("\\|\\|"); String[] split = line.split("\\|\\|");

12
nukkit/src/main/java/com/boydti/fawe/nukkit/core/converter/ConverterFrame.java
View File

@ -65,8 +65,6 @@ public class ConverterFrame extends JFrame {
private BrowseButton browseSave; private BrowseButton browseSave;
public ConverterFrame() throws Exception { public ConverterFrame() throws Exception {
async(() -> downloadDependencies());
final MovablePanel movable = new MovablePanel(this); final MovablePanel movable = new MovablePanel(this);
movable.setBorder(BorderFactory.createLineBorder(new Color(0x28, 0x28, 0x29))); movable.setBorder(BorderFactory.createLineBorder(new Color(0x28, 0x28, 0x29)));
@ -294,6 +292,8 @@ public class ConverterFrame extends JFrame {
movable.add(bottomBar, BorderLayout.SOUTH); movable.add(bottomBar, BorderLayout.SOUTH);
this.setVisible(true); this.setVisible(true);
this.repaint(); this.repaint();
async(() -> downloadDependencies());
} }
public void prompt(String message) { public void prompt(String message) {
@ -368,7 +368,7 @@ public class ConverterFrame extends JFrame {
try { try {
MainUtil.download(levelDbUrl, leveldb); MainUtil.download(levelDbUrl, leveldb);
MainUtil.loadURLClasspath(leveldb.toURL()); MainUtil.loadURLClasspath(leveldb.toURL());
} catch (IOException e) { } catch (Throwable e) {
e.printStackTrace(); e.printStackTrace();
} }
}); });
@ -376,7 +376,7 @@ public class ConverterFrame extends JFrame {
pool.submit((Runnable) () -> { pool.submit((Runnable) () -> {
try { try {
scraper.scapeOrCache(WikiScraper.Wiki.ITEM_MAPPINGS_PE); scraper.scapeOrCache(WikiScraper.Wiki.ITEM_MAPPINGS_PE);
} catch (IOException e) { } catch (Throwable e) {
e.printStackTrace(); e.printStackTrace();
} }
}); });
@ -384,7 +384,7 @@ public class ConverterFrame extends JFrame {
pool.submit((Runnable) () -> { pool.submit((Runnable) () -> {
try { try {
scraper.scapeOrCache(WikiScraper.Wiki.ITEM_MAPPINGS_PC); scraper.scapeOrCache(WikiScraper.Wiki.ITEM_MAPPINGS_PC);
} catch (IOException e) { } catch (Throwable e) {
e.printStackTrace(); e.printStackTrace();
} }
}); });
@ -392,7 +392,7 @@ public class ConverterFrame extends JFrame {
pool.submit((Runnable) () -> { pool.submit((Runnable) () -> {
try { try {
scraper.scapeOrCache(WikiScraper.Wiki.ENTITY_MAPPINGS); scraper.scapeOrCache(WikiScraper.Wiki.ENTITY_MAPPINGS);
} catch (IOException e) { } catch (Throwable e) {
e.printStackTrace(); e.printStackTrace();
} }
}); });

11
nukkit/src/main/java/com/boydti/fawe/nukkit/core/converter/LevelDBToMCAFile.java
View File

@ -6,7 +6,7 @@ import com.boydti.fawe.jnbt.anvil.MCAQueue;
import com.boydti.fawe.jnbt.anvil.MCAQueueMap; import com.boydti.fawe.jnbt.anvil.MCAQueueMap;
import com.boydti.fawe.jnbt.anvil.MutableMCABackedBaseBlock; import com.boydti.fawe.jnbt.anvil.MutableMCABackedBaseBlock;
import com.boydti.fawe.jnbt.anvil.filters.RemapFilter; import com.boydti.fawe.jnbt.anvil.filters.RemapFilter;
import com.boydti.fawe.object.clipboard.ClipboardRemapper; import com.boydti.fawe.object.clipboard.remap.ClipboardRemapper;
import com.boydti.fawe.object.io.PGZIPOutputStream; import com.boydti.fawe.object.io.PGZIPOutputStream;
import com.boydti.fawe.util.MemUtil; import com.boydti.fawe.util.MemUtil;
import com.boydti.fawe.util.ReflectionUtils; import com.boydti.fawe.util.ReflectionUtils;
@ -158,16 +158,19 @@ public class LevelDBToMCAFile extends MapConverter {
List<NamedTag> tags = read(value); List<NamedTag> tags = read(value);
for (NamedTag nt : tags) { for (NamedTag nt : tags) {
com.sk89q.jnbt.Tag ent = nt.getTag(); com.sk89q.jnbt.Tag ent = nt.getTag();
// chunk.setEntity((CompoundTag) ent); chunk.setEntity((CompoundTag) ent);
} }
break; break;
case PendingTicks:
break;
case BlockExtraData:
System.out.println("EXTRA " + chunk.getX() + "," + chunk.getZ());
break;
case LegacyTerrain: case LegacyTerrain:
case Data2DLegacy: case Data2DLegacy:
Fawe.debug("Legacy terrain not supported, please update. " + tag); Fawe.debug("Legacy terrain not supported, please update. " + tag);
case BiomeState: case BiomeState:
case FinalizedState: case FinalizedState:
case PendingTicks:
case BlockExtraData:
case Version: case Version:
break; break;
} }