mirror of
https://github.com/boy0001/FastAsyncWorldedit.git
synced 2024-11-28 13:45:36 +01:00
Various minor
fix parallel threads for sponge remove static modifier for some fields
This commit is contained in:
parent
71306cb749
commit
7ba4e51a22
@ -123,6 +123,12 @@ public class Settings extends Config {
|
|||||||
" - Having an artificial delay will use more CPU/Memory",
|
" - Having an artificial delay will use more CPU/Memory",
|
||||||
})
|
})
|
||||||
public int SPEED_REDUCTION = 0;
|
public int SPEED_REDUCTION = 0;
|
||||||
|
@Comment({
|
||||||
|
"Place chunks instead of individual blocks:",
|
||||||
|
" - Disabling this will negatively impact performance",
|
||||||
|
" - Only disable this for compatibility or cinematic placement",
|
||||||
|
})
|
||||||
|
public boolean FAST_PLACEMENT = true;
|
||||||
@Comment({
|
@Comment({
|
||||||
"Should WorldEdit use inventory?",
|
"Should WorldEdit use inventory?",
|
||||||
"0 = No inventory usage (creative)",
|
"0 = No inventory usage (creative)",
|
||||||
@ -130,10 +136,6 @@ public class Settings extends Config {
|
|||||||
"2 = Inventory for placing (survival)",
|
"2 = Inventory for placing (survival)",
|
||||||
})
|
})
|
||||||
public int INVENTORY_MODE = 0;
|
public int INVENTORY_MODE = 0;
|
||||||
@Comment({
|
|
||||||
"Place chunks instead of individual blocks"
|
|
||||||
})
|
|
||||||
public boolean FAST_PLACEMENT = true;
|
|
||||||
@Comment({
|
@Comment({
|
||||||
"Should large edits require confirmation (>16384 chunks)",
|
"Should large edits require confirmation (>16384 chunks)",
|
||||||
})
|
})
|
||||||
@ -271,7 +273,7 @@ public class Settings extends Config {
|
|||||||
" - E.g. A plugin creates an EditSession but never does anything with it",
|
" - E.g. A plugin creates an EditSession but never does anything with it",
|
||||||
" - This only applies to plugins improperly using WorldEdit's legacy API"
|
" - This only applies to plugins improperly using WorldEdit's legacy API"
|
||||||
})
|
})
|
||||||
public static int DISCARD_AFTER_MS = 60000;
|
public int DISCARD_AFTER_MS = 60000;
|
||||||
|
|
||||||
public static class PROGRESS {
|
public static class PROGRESS {
|
||||||
@Comment({"Display constant titles about the progress of a user's edit",
|
@Comment({"Display constant titles about the progress of a user's edit",
|
||||||
@ -377,7 +379,7 @@ public class Settings extends Config {
|
|||||||
" - 1 = Optimal (Relight changed light sources and changed blocks)",
|
" - 1 = Optimal (Relight changed light sources and changed blocks)",
|
||||||
" - 2 = All (Slowly relight every blocks)"
|
" - 2 = All (Slowly relight every blocks)"
|
||||||
})
|
})
|
||||||
public static int MODE = 1;
|
public int MODE = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void reload(File file) {
|
public void reload(File file) {
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package com.boydti.fawe.forge;
|
package com.boydti.fawe.forge;
|
||||||
|
|
||||||
import com.boydti.fawe.Fawe;
|
import com.boydti.fawe.Fawe;
|
||||||
|
import com.boydti.fawe.config.Settings;
|
||||||
import com.boydti.fawe.object.FaweCommand;
|
import com.boydti.fawe.object.FaweCommand;
|
||||||
import com.boydti.fawe.object.FawePlayer;
|
import com.boydti.fawe.object.FawePlayer;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
@ -32,6 +33,10 @@ public class ForgeMain {
|
|||||||
MinecraftForge.EVENT_BUS.register(this);
|
MinecraftForge.EVENT_BUS.register(this);
|
||||||
FMLCommonHandler.instance().bus().register(this);
|
FMLCommonHandler.instance().bus().register(this);
|
||||||
this.IMP = new FaweForge(this, event.getModLog(), event.getModMetadata(), directory);
|
this.IMP = new FaweForge(this, event.getModLog(), event.getModMetadata(), directory);
|
||||||
|
try {
|
||||||
|
Class.forName("org.spongepowered.api.Sponge");
|
||||||
|
Settings.IMP.QUEUE.PARALLEL_THREADS = 1;
|
||||||
|
} catch (Throwable ignore) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Mod.EventHandler
|
@Mod.EventHandler
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package com.boydti.fawe.forge;
|
package com.boydti.fawe.forge;
|
||||||
|
|
||||||
import com.boydti.fawe.Fawe;
|
import com.boydti.fawe.Fawe;
|
||||||
|
import com.boydti.fawe.config.Settings;
|
||||||
import com.boydti.fawe.object.FaweCommand;
|
import com.boydti.fawe.object.FaweCommand;
|
||||||
import com.boydti.fawe.object.FawePlayer;
|
import com.boydti.fawe.object.FawePlayer;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
@ -31,6 +32,10 @@ public class ForgeMain {
|
|||||||
MinecraftForge.EVENT_BUS.register(this);
|
MinecraftForge.EVENT_BUS.register(this);
|
||||||
FMLCommonHandler.instance().bus().register(this);
|
FMLCommonHandler.instance().bus().register(this);
|
||||||
this.IMP = new FaweForge(this, event.getModLog(), event.getModMetadata(), directory);
|
this.IMP = new FaweForge(this, event.getModLog(), event.getModMetadata(), directory);
|
||||||
|
try {
|
||||||
|
Class.forName("org.spongepowered.api.Sponge");
|
||||||
|
Settings.IMP.QUEUE.PARALLEL_THREADS = 1;
|
||||||
|
} catch (Throwable ignore) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Mod.EventHandler
|
@Mod.EventHandler
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package com.boydti.fawe.forge;
|
package com.boydti.fawe.forge;
|
||||||
|
|
||||||
import com.boydti.fawe.Fawe;
|
import com.boydti.fawe.Fawe;
|
||||||
|
import com.boydti.fawe.config.Settings;
|
||||||
import com.boydti.fawe.object.FaweCommand;
|
import com.boydti.fawe.object.FaweCommand;
|
||||||
import com.boydti.fawe.object.FawePlayer;
|
import com.boydti.fawe.object.FawePlayer;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
@ -31,6 +32,10 @@ public class ForgeMain {
|
|||||||
MinecraftForge.EVENT_BUS.register(this);
|
MinecraftForge.EVENT_BUS.register(this);
|
||||||
FMLCommonHandler.instance().bus().register(this);
|
FMLCommonHandler.instance().bus().register(this);
|
||||||
this.IMP = new FaweForge(this, event.getModLog(), event.getModMetadata(), directory);
|
this.IMP = new FaweForge(this, event.getModLog(), event.getModMetadata(), directory);
|
||||||
|
try {
|
||||||
|
Class.forName("org.spongepowered.api.Sponge");
|
||||||
|
Settings.IMP.QUEUE.PARALLEL_THREADS = 1;
|
||||||
|
} catch (Throwable ignore) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Mod.EventHandler
|
@Mod.EventHandler
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package com.boydti.fawe.forge;
|
package com.boydti.fawe.forge;
|
||||||
|
|
||||||
import com.boydti.fawe.Fawe;
|
import com.boydti.fawe.Fawe;
|
||||||
|
import com.boydti.fawe.config.Settings;
|
||||||
import com.boydti.fawe.object.FawePlayer;
|
import com.boydti.fawe.object.FawePlayer;
|
||||||
import cpw.mods.fml.common.FMLCommonHandler;
|
import cpw.mods.fml.common.FMLCommonHandler;
|
||||||
import cpw.mods.fml.common.Mod;
|
import cpw.mods.fml.common.Mod;
|
||||||
@ -31,6 +32,10 @@ public class ForgeMain {
|
|||||||
MinecraftForge.EVENT_BUS.register(this);
|
MinecraftForge.EVENT_BUS.register(this);
|
||||||
FMLCommonHandler.instance().bus().register(this);
|
FMLCommonHandler.instance().bus().register(this);
|
||||||
this.IMP = new FaweForge(this, event.getModLog(), event.getModMetadata(), directory);
|
this.IMP = new FaweForge(this, event.getModLog(), event.getModMetadata(), directory);
|
||||||
|
try {
|
||||||
|
Class.forName("org.spongepowered.api.Sponge");
|
||||||
|
Settings.IMP.QUEUE.PARALLEL_THREADS = 1;
|
||||||
|
} catch (Throwable ignore) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Mod.EventHandler
|
@Mod.EventHandler
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package com.boydti.fawe.forge;
|
package com.boydti.fawe.forge;
|
||||||
|
|
||||||
import com.boydti.fawe.Fawe;
|
import com.boydti.fawe.Fawe;
|
||||||
|
import com.boydti.fawe.config.Settings;
|
||||||
import com.boydti.fawe.object.FawePlayer;
|
import com.boydti.fawe.object.FawePlayer;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -31,6 +32,10 @@ public class ForgeMain {
|
|||||||
MinecraftForge.EVENT_BUS.register(this);
|
MinecraftForge.EVENT_BUS.register(this);
|
||||||
FMLCommonHandler.instance().bus().register(this);
|
FMLCommonHandler.instance().bus().register(this);
|
||||||
this.IMP = new FaweForge(this, event.getModLog(), event.getModMetadata(), directory);
|
this.IMP = new FaweForge(this, event.getModLog(), event.getModMetadata(), directory);
|
||||||
|
try {
|
||||||
|
Class.forName("org.spongepowered.api.Sponge");
|
||||||
|
Settings.IMP.QUEUE.PARALLEL_THREADS = 1;
|
||||||
|
} catch (Throwable ignore) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Mod.EventHandler
|
@Mod.EventHandler
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package com.boydti.fawe.forge;
|
package com.boydti.fawe.forge;
|
||||||
|
|
||||||
import com.boydti.fawe.Fawe;
|
import com.boydti.fawe.Fawe;
|
||||||
|
import com.boydti.fawe.config.Settings;
|
||||||
import com.boydti.fawe.object.FawePlayer;
|
import com.boydti.fawe.object.FawePlayer;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -30,6 +31,10 @@ public class ForgeMain {
|
|||||||
MinecraftForge.EVENT_BUS.register(this);
|
MinecraftForge.EVENT_BUS.register(this);
|
||||||
FMLCommonHandler.instance().bus().register(this);
|
FMLCommonHandler.instance().bus().register(this);
|
||||||
this.IMP = new FaweForge(this, event.getModLog(), event.getModMetadata(), directory);
|
this.IMP = new FaweForge(this, event.getModLog(), event.getModMetadata(), directory);
|
||||||
|
try {
|
||||||
|
Class.forName("org.spongepowered.api.Sponge");
|
||||||
|
Settings.IMP.QUEUE.PARALLEL_THREADS = 1;
|
||||||
|
} catch (Throwable ignore) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Mod.EventHandler
|
@Mod.EventHandler
|
||||||
|
Loading…
Reference in New Issue
Block a user