Remove: KoshakAntiVPN, disable BiomesHooks
This commit is contained in:
Binary file not shown.
@@ -1,13 +1,10 @@
|
|||||||
package com.reider745;
|
package com.reider745;
|
||||||
|
|
||||||
import cn.nukkit.Server;
|
import cn.nukkit.Server;
|
||||||
import cn.nukkit.plugin.Plugin;
|
|
||||||
import cn.nukkit.plugin.PluginDescription;
|
import cn.nukkit.plugin.PluginDescription;
|
||||||
import cn.nukkit.plugin.PluginLoader;
|
|
||||||
import cn.nukkit.plugin.PluginManager;
|
import cn.nukkit.plugin.PluginManager;
|
||||||
|
|
||||||
import com.google.common.base.Preconditions;
|
import com.google.common.base.Preconditions;
|
||||||
import com.koshakmine.antivpn.KoshakAntiVPN;
|
|
||||||
import com.reider745.api.CallbackHelper;
|
import com.reider745.api.CallbackHelper;
|
||||||
import com.reider745.block.CustomBlock;
|
import com.reider745.block.CustomBlock;
|
||||||
import com.reider745.commands.CommandsHelper;
|
import com.reider745.commands.CommandsHelper;
|
||||||
@@ -23,7 +20,6 @@ import com.zhekasmirnov.apparatus.mcpe.NativeWorkbench;
|
|||||||
import com.zhekasmirnov.apparatus.multiplayer.Network;
|
import com.zhekasmirnov.apparatus.multiplayer.Network;
|
||||||
import com.zhekasmirnov.apparatus.multiplayer.NetworkConfig;
|
import com.zhekasmirnov.apparatus.multiplayer.NetworkConfig;
|
||||||
import com.zhekasmirnov.horizon.runtime.logger.Logger;
|
import com.zhekasmirnov.horizon.runtime.logger.Logger;
|
||||||
import com.zhekasmirnov.innercore.api.InnerCoreConfig;
|
|
||||||
import com.zhekasmirnov.innercore.api.NativeCallback;
|
import com.zhekasmirnov.innercore.api.NativeCallback;
|
||||||
import com.zhekasmirnov.innercore.api.NativeFurnaceRegistry;
|
import com.zhekasmirnov.innercore.api.NativeFurnaceRegistry;
|
||||||
import com.zhekasmirnov.innercore.api.runtime.LoadingStage;
|
import com.zhekasmirnov.innercore.api.runtime.LoadingStage;
|
||||||
@@ -51,7 +47,6 @@ import java.util.HashMap;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.regex.Pattern;
|
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
import java.util.zip.ZipEntry;
|
import java.util.zip.ZipEntry;
|
||||||
import java.util.zip.ZipFile;
|
import java.util.zip.ZipFile;
|
||||||
@@ -299,21 +294,6 @@ public class InnerCoreServer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void afterload() {
|
public void afterload() {
|
||||||
if(getPropertyBoolean("KoshakAntiVPN", true)){
|
|
||||||
HashMap<String, Object> description = new HashMap<>();
|
|
||||||
description.put("name", "KoshakAntiVPN");
|
|
||||||
description.put("version", "SNAPSHOT");
|
|
||||||
description.put("main", InnerCorePlugin.class.getName());
|
|
||||||
description.put("api", new ArrayList<String>());
|
|
||||||
|
|
||||||
final File dataFolderFile = new File(dataPath);
|
|
||||||
KoshakAntiVPN koshakAntiVPN = new KoshakAntiVPN();
|
|
||||||
koshakAntiVPN.init(null, Server.getInstance(), new PluginDescription(description), dataFolderFile, dataFolderFile);
|
|
||||||
koshakAntiVPN.saveDefaultConfig();
|
|
||||||
koshakAntiVPN.onLoad();
|
|
||||||
koshakAntiVPN.setEnabled();
|
|
||||||
}
|
|
||||||
|
|
||||||
Server.getInstance().getLogger().info("Registering Nukkit-MOT containment...");
|
Server.getInstance().getLogger().info("Registering Nukkit-MOT containment...");
|
||||||
PluginManager pluginManager = Server.getInstance().getPluginManager();
|
PluginManager pluginManager = Server.getInstance().getPluginManager();
|
||||||
pluginManager.getPlugins().put(plugin.getDescription().getName(), plugin);
|
pluginManager.getPlugins().put(plugin.getDescription().getName(), plugin);
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ public class Main {
|
|||||||
loader.registerHooksInitializationForClass(ItemUtils.class);
|
loader.registerHooksInitializationForClass(ItemUtils.class);
|
||||||
loader.registerHooksInitializationForClass(AndroidHooks.class);
|
loader.registerHooksInitializationForClass(AndroidHooks.class);
|
||||||
loader.registerHooksInitializationForClass(SnowfallEverywhere.class);
|
loader.registerHooksInitializationForClass(SnowfallEverywhere.class);
|
||||||
loader.registerHooksInitializationForClass(BiomesHooks.class);
|
//loader.registerHooksInitializationForClass(BiomesHooks.class);
|
||||||
loader.registerHooksInitializationForClass(GlobalBanList.class);
|
loader.registerHooksInitializationForClass(GlobalBanList.class);
|
||||||
|
|
||||||
//bug fix
|
//bug fix
|
||||||
|
|||||||
@@ -61,9 +61,13 @@ public class BiomesHooks implements HookClass {
|
|||||||
@Inject(className = "cn.nukkit.level.generator.Normal")
|
@Inject(className = "cn.nukkit.level.generator.Normal")
|
||||||
public static Biome pickBiome(Normal self, int x, int z) {
|
public static Biome pickBiome(Normal self, int x, int z) {
|
||||||
final Biome[][] biomes_override = threads_biomes_replace.get(Thread.currentThread().getId());
|
final Biome[][] biomes_override = threads_biomes_replace.get(Thread.currentThread().getId());
|
||||||
|
if(biomes_override == null)
|
||||||
|
return ((BiomeSelector) ReflectHelper.getField(self, "selector")).pickBiome(x, z);
|
||||||
|
|
||||||
final Biome biome = biomes_override[Math.abs(x % 16)][Math.abs(z % 16)];
|
final Biome biome = biomes_override[Math.abs(x % 16)][Math.abs(z % 16)];
|
||||||
if(biome != null)
|
if(biome != null)
|
||||||
return biome;
|
return biome;
|
||||||
|
|
||||||
return ((BiomeSelector) ReflectHelper.getField(self, "selector")).pickBiome(x, z);
|
return ((BiomeSelector) ReflectHelper.getField(self, "selector")).pickBiome(x, z);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user