From 5fb79bdb4a572647b00d0a0fc10215642d6b417d Mon Sep 17 00:00:00 2001 From: Irtimaled Date: Sun, 10 May 2020 02:01:06 -0700 Subject: [PATCH] Move config to client module --- .../java/com/irtimaled/bbor/client/ClientProxy.java | 6 +++++- .../com/irtimaled/bbor/client/ClientRenderer.java | 2 +- .../bbor/client/commands/ConfigCommand.java | 4 ++-- .../bbor/{ => client}/config/AbstractSetting.java | 2 +- .../bbor/client/config/BoundingBoxTypeHelper.java | 2 -- .../bbor/{ => client}/config/ConfigManager.java | 12 ++++++------ .../bbor/{ => client}/config/Configuration.java | 6 +++--- .../irtimaled/bbor/{ => client}/config/Setting.java | 2 +- .../irtimaled/bbor/client/gui/BoolSettingButton.java | 4 ++-- .../irtimaled/bbor/client/gui/IntSettingSlider.java | 2 +- .../irtimaled/bbor/client/gui/MaxYSettingSlider.java | 2 +- .../irtimaled/bbor/client/gui/SettingsScreen.java | 2 +- .../bbor/client/providers/BiomeBorderProvider.java | 2 +- .../bbor/client/providers/CacheProvider.java | 2 +- .../bbor/client/renderers/AbstractRenderer.java | 2 +- .../bbor/client/renderers/BiomeBorderRenderer.java | 2 +- .../bbor/client/renderers/ConduitRenderer.java | 2 +- .../bbor/client/renderers/MobSpawnerRenderer.java | 2 +- .../bbor/client/renderers/SlimeChunkRenderer.java | 2 +- .../client/renderers/SpawningSphereRenderer.java | 2 +- .../bbor/client/renderers/VillageRenderer.java | 2 +- .../bbor/client/renderers/WorldSpawnRenderer.java | 2 +- .../irtimaled/bbor/common/interop/CommonInterop.java | 6 ------ .../irtimaled/bbor/mixin/client/MixinMinecraft.java | 2 -- .../mixin/server/dedicated/MixinDedicatedServer.java | 2 -- 25 files changed, 34 insertions(+), 42 deletions(-) rename src/main/java/com/irtimaled/bbor/{ => client}/config/AbstractSetting.java (88%) rename src/main/java/com/irtimaled/bbor/{ => client}/config/ConfigManager.java (97%) rename src/main/java/com/irtimaled/bbor/{ => client}/config/Configuration.java (97%) rename src/main/java/com/irtimaled/bbor/{ => client}/config/Setting.java (89%) diff --git a/src/main/java/com/irtimaled/bbor/client/ClientProxy.java b/src/main/java/com/irtimaled/bbor/client/ClientProxy.java index 8d527ae..c85cb93 100644 --- a/src/main/java/com/irtimaled/bbor/client/ClientProxy.java +++ b/src/main/java/com/irtimaled/bbor/client/ClientProxy.java @@ -1,5 +1,6 @@ package com.irtimaled.bbor.client; +import com.irtimaled.bbor.client.config.ConfigManager; import com.irtimaled.bbor.client.events.*; import com.irtimaled.bbor.client.gui.LoadSavesScreen; import com.irtimaled.bbor.client.gui.SettingsScreen; @@ -10,7 +11,6 @@ import com.irtimaled.bbor.common.BoundingBoxCache; import com.irtimaled.bbor.common.CommonProxy; import com.irtimaled.bbor.common.EventBus; import com.irtimaled.bbor.common.VillageColorCache; -import com.irtimaled.bbor.config.ConfigManager; public class ClientProxy extends CommonProxy { static { @@ -24,6 +24,10 @@ public class ClientProxy extends CommonProxy { .onKeyPressHandler(LoadSavesScreen::show); } + public ClientProxy() { + ConfigManager.loadConfig(); + } + @Override public void init() { super.init(); diff --git a/src/main/java/com/irtimaled/bbor/client/ClientRenderer.java b/src/main/java/com/irtimaled/bbor/client/ClientRenderer.java index f4d73cd..6672c69 100644 --- a/src/main/java/com/irtimaled/bbor/client/ClientRenderer.java +++ b/src/main/java/com/irtimaled/bbor/client/ClientRenderer.java @@ -1,5 +1,6 @@ package com.irtimaled.bbor.client; +import com.irtimaled.bbor.client.config.ConfigManager; import com.irtimaled.bbor.client.interop.ClientInterop; import com.irtimaled.bbor.client.models.*; import com.irtimaled.bbor.client.providers.*; @@ -8,7 +9,6 @@ import com.irtimaled.bbor.common.MathHelper; import com.irtimaled.bbor.common.models.AbstractBoundingBox; import com.irtimaled.bbor.common.models.BoundingBoxCuboid; import com.irtimaled.bbor.common.models.BoundingBoxVillage; -import com.irtimaled.bbor.config.ConfigManager; import org.lwjgl.opengl.GL11; import java.util.HashMap; diff --git a/src/main/java/com/irtimaled/bbor/client/commands/ConfigCommand.java b/src/main/java/com/irtimaled/bbor/client/commands/ConfigCommand.java index 3e8aa95..48ab1ae 100644 --- a/src/main/java/com/irtimaled/bbor/client/commands/ConfigCommand.java +++ b/src/main/java/com/irtimaled/bbor/client/commands/ConfigCommand.java @@ -1,8 +1,8 @@ package com.irtimaled.bbor.client.commands; +import com.irtimaled.bbor.client.config.ConfigManager; +import com.irtimaled.bbor.client.config.Setting; import com.irtimaled.bbor.client.gui.SettingsScreen; -import com.irtimaled.bbor.config.ConfigManager; -import com.irtimaled.bbor.config.Setting; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.BoolArgumentType; import com.mojang.brigadier.arguments.IntegerArgumentType; diff --git a/src/main/java/com/irtimaled/bbor/config/AbstractSetting.java b/src/main/java/com/irtimaled/bbor/client/config/AbstractSetting.java similarity index 88% rename from src/main/java/com/irtimaled/bbor/config/AbstractSetting.java rename to src/main/java/com/irtimaled/bbor/client/config/AbstractSetting.java index 0ff0901..0d64876 100644 --- a/src/main/java/com/irtimaled/bbor/config/AbstractSetting.java +++ b/src/main/java/com/irtimaled/bbor/client/config/AbstractSetting.java @@ -1,4 +1,4 @@ -package com.irtimaled.bbor.config; +package com.irtimaled.bbor.client.config; public abstract class AbstractSetting { String comment; diff --git a/src/main/java/com/irtimaled/bbor/client/config/BoundingBoxTypeHelper.java b/src/main/java/com/irtimaled/bbor/client/config/BoundingBoxTypeHelper.java index b86346e..084652f 100644 --- a/src/main/java/com/irtimaled/bbor/client/config/BoundingBoxTypeHelper.java +++ b/src/main/java/com/irtimaled/bbor/client/config/BoundingBoxTypeHelper.java @@ -1,8 +1,6 @@ package com.irtimaled.bbor.client.config; import com.irtimaled.bbor.common.BoundingBoxType; -import com.irtimaled.bbor.config.ConfigManager; -import com.irtimaled.bbor.config.Setting; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/irtimaled/bbor/config/ConfigManager.java b/src/main/java/com/irtimaled/bbor/client/config/ConfigManager.java similarity index 97% rename from src/main/java/com/irtimaled/bbor/config/ConfigManager.java rename to src/main/java/com/irtimaled/bbor/client/config/ConfigManager.java index 0815a40..d6c301c 100644 --- a/src/main/java/com/irtimaled/bbor/config/ConfigManager.java +++ b/src/main/java/com/irtimaled/bbor/client/config/ConfigManager.java @@ -1,4 +1,4 @@ -package com.irtimaled.bbor.config; +package com.irtimaled.bbor.client.config; import java.io.File; import java.util.HashSet; @@ -6,7 +6,7 @@ import java.util.Set; public class ConfigManager { private static final Set> settings = new HashSet<>(); - public static File configDir; + private static File configDir; public static Setting fill; public static Setting drawVillages; @@ -54,10 +54,10 @@ public class ConfigManager { public static Setting drawConduits; public static Setting renderConduitMobHarmArea; - public static void loadConfig(File mcConfigDir) { - configDir = new File(mcConfigDir, "config"); + public static void loadConfig() { + configDir = new File(".", "config"); configDir.mkdirs(); - Configuration config = loadConfig(); + Configuration config = loadConfiguration(); fill = setup(config, "general", "fill", true, "If set to true the bounding boxes are filled."); outerBoxesOnly = setup(config, "general", "outerBoxesOnly", false, "If set to true only the outer bounding boxes are rendered."); @@ -117,7 +117,7 @@ public class ConfigManager { config.save(); } - private static Configuration loadConfig() { + private static Configuration loadConfiguration() { Configuration config = new Configuration(new File(configDir, "BBOutlineReloaded.cfg")); config.load(); return config; diff --git a/src/main/java/com/irtimaled/bbor/config/Configuration.java b/src/main/java/com/irtimaled/bbor/client/config/Configuration.java similarity index 97% rename from src/main/java/com/irtimaled/bbor/config/Configuration.java rename to src/main/java/com/irtimaled/bbor/client/config/Configuration.java index f061093..65f9a0d 100644 --- a/src/main/java/com/irtimaled/bbor/config/Configuration.java +++ b/src/main/java/com/irtimaled/bbor/client/config/Configuration.java @@ -1,4 +1,4 @@ -package com.irtimaled.bbor.config; +package com.irtimaled.bbor.client.config; import com.google.common.io.Files; @@ -8,8 +8,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class Configuration { - public static final String FALLBACK_CATEGORY = "features"; +class Configuration { + private static final String FALLBACK_CATEGORY = "features"; private final File file; Configuration(File file) { diff --git a/src/main/java/com/irtimaled/bbor/config/Setting.java b/src/main/java/com/irtimaled/bbor/client/config/Setting.java similarity index 89% rename from src/main/java/com/irtimaled/bbor/config/Setting.java rename to src/main/java/com/irtimaled/bbor/client/config/Setting.java index e1dabf3..f07f5fb 100644 --- a/src/main/java/com/irtimaled/bbor/config/Setting.java +++ b/src/main/java/com/irtimaled/bbor/client/config/Setting.java @@ -1,4 +1,4 @@ -package com.irtimaled.bbor.config; +package com.irtimaled.bbor.client.config; public class Setting extends AbstractSetting { private T value; diff --git a/src/main/java/com/irtimaled/bbor/client/gui/BoolSettingButton.java b/src/main/java/com/irtimaled/bbor/client/gui/BoolSettingButton.java index da3c115..e4f7bb6 100644 --- a/src/main/java/com/irtimaled/bbor/client/gui/BoolSettingButton.java +++ b/src/main/java/com/irtimaled/bbor/client/gui/BoolSettingButton.java @@ -1,7 +1,7 @@ package com.irtimaled.bbor.client.gui; -import com.irtimaled.bbor.config.ConfigManager; -import com.irtimaled.bbor.config.Setting; +import com.irtimaled.bbor.client.config.ConfigManager; +import com.irtimaled.bbor.client.config.Setting; public class BoolSettingButton extends BoolButton { private final Setting setting; diff --git a/src/main/java/com/irtimaled/bbor/client/gui/IntSettingSlider.java b/src/main/java/com/irtimaled/bbor/client/gui/IntSettingSlider.java index 2c7eb62..587bb46 100644 --- a/src/main/java/com/irtimaled/bbor/client/gui/IntSettingSlider.java +++ b/src/main/java/com/irtimaled/bbor/client/gui/IntSettingSlider.java @@ -1,6 +1,6 @@ package com.irtimaled.bbor.client.gui; -import com.irtimaled.bbor.config.Setting; +import com.irtimaled.bbor.client.config.Setting; import net.minecraft.client.resources.I18n; import java.util.HashMap; diff --git a/src/main/java/com/irtimaled/bbor/client/gui/MaxYSettingSlider.java b/src/main/java/com/irtimaled/bbor/client/gui/MaxYSettingSlider.java index b518d7d..7c6562e 100644 --- a/src/main/java/com/irtimaled/bbor/client/gui/MaxYSettingSlider.java +++ b/src/main/java/com/irtimaled/bbor/client/gui/MaxYSettingSlider.java @@ -1,6 +1,6 @@ package com.irtimaled.bbor.client.gui; -import com.irtimaled.bbor.config.Setting; +import com.irtimaled.bbor.client.config.Setting; import net.minecraft.client.resources.I18n; class MaxYSettingSlider extends IntSettingSlider { diff --git a/src/main/java/com/irtimaled/bbor/client/gui/SettingsScreen.java b/src/main/java/com/irtimaled/bbor/client/gui/SettingsScreen.java index 0c58085..92da9ec 100644 --- a/src/main/java/com/irtimaled/bbor/client/gui/SettingsScreen.java +++ b/src/main/java/com/irtimaled/bbor/client/gui/SettingsScreen.java @@ -1,9 +1,9 @@ package com.irtimaled.bbor.client.gui; import com.irtimaled.bbor.client.ClientRenderer; +import com.irtimaled.bbor.client.config.ConfigManager; import com.irtimaled.bbor.client.interop.ClientInterop; import com.irtimaled.bbor.common.BoundingBoxType; -import com.irtimaled.bbor.config.ConfigManager; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/com/irtimaled/bbor/client/providers/BiomeBorderProvider.java b/src/main/java/com/irtimaled/bbor/client/providers/BiomeBorderProvider.java index 1957bd5..8fa64df 100644 --- a/src/main/java/com/irtimaled/bbor/client/providers/BiomeBorderProvider.java +++ b/src/main/java/com/irtimaled/bbor/client/providers/BiomeBorderProvider.java @@ -2,12 +2,12 @@ package com.irtimaled.bbor.client.providers; import com.irtimaled.bbor.client.Player; import com.irtimaled.bbor.client.config.BoundingBoxTypeHelper; +import com.irtimaled.bbor.client.config.ConfigManager; import com.irtimaled.bbor.client.interop.BiomeBorderHelper; import com.irtimaled.bbor.client.models.BoundingBoxBiomeBorder; import com.irtimaled.bbor.common.BoundingBoxType; import com.irtimaled.bbor.common.MathHelper; import com.irtimaled.bbor.common.models.Coords; -import com.irtimaled.bbor.config.ConfigManager; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/irtimaled/bbor/client/providers/CacheProvider.java b/src/main/java/com/irtimaled/bbor/client/providers/CacheProvider.java index 17687f1..b66b2da 100644 --- a/src/main/java/com/irtimaled/bbor/client/providers/CacheProvider.java +++ b/src/main/java/com/irtimaled/bbor/client/providers/CacheProvider.java @@ -3,11 +3,11 @@ package com.irtimaled.bbor.client.providers; import com.irtimaled.bbor.client.GetCache; import com.irtimaled.bbor.client.Player; import com.irtimaled.bbor.client.config.BoundingBoxTypeHelper; +import com.irtimaled.bbor.client.config.ConfigManager; import com.irtimaled.bbor.client.interop.ClientInterop; import com.irtimaled.bbor.common.BoundingBoxCache; import com.irtimaled.bbor.common.MathHelper; import com.irtimaled.bbor.common.models.AbstractBoundingBox; -import com.irtimaled.bbor.config.ConfigManager; import java.util.HashSet; import java.util.Map; diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/AbstractRenderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/AbstractRenderer.java index c40665e..d701e47 100644 --- a/src/main/java/com/irtimaled/bbor/client/renderers/AbstractRenderer.java +++ b/src/main/java/com/irtimaled/bbor/client/renderers/AbstractRenderer.java @@ -1,7 +1,7 @@ package com.irtimaled.bbor.client.renderers; +import com.irtimaled.bbor.client.config.ConfigManager; import com.irtimaled.bbor.common.models.AbstractBoundingBox; -import com.irtimaled.bbor.config.ConfigManager; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.OpenGlHelper; diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/BiomeBorderRenderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/BiomeBorderRenderer.java index 8061b5c..34deb7c 100644 --- a/src/main/java/com/irtimaled/bbor/client/renderers/BiomeBorderRenderer.java +++ b/src/main/java/com/irtimaled/bbor/client/renderers/BiomeBorderRenderer.java @@ -1,8 +1,8 @@ package com.irtimaled.bbor.client.renderers; +import com.irtimaled.bbor.client.config.ConfigManager; import com.irtimaled.bbor.client.models.BoundingBoxBiomeBorder; import com.irtimaled.bbor.common.models.Coords; -import com.irtimaled.bbor.config.ConfigManager; import java.awt.*; diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/ConduitRenderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/ConduitRenderer.java index 65e1d8c..a5b5ec2 100644 --- a/src/main/java/com/irtimaled/bbor/client/renderers/ConduitRenderer.java +++ b/src/main/java/com/irtimaled/bbor/client/renderers/ConduitRenderer.java @@ -1,9 +1,9 @@ package com.irtimaled.bbor.client.renderers; +import com.irtimaled.bbor.client.config.ConfigManager; import com.irtimaled.bbor.client.models.BoundingBoxConduit; import com.irtimaled.bbor.common.models.Colors; import com.irtimaled.bbor.common.models.Coords; -import com.irtimaled.bbor.config.ConfigManager; import java.awt.*; diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/MobSpawnerRenderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/MobSpawnerRenderer.java index d3ac71c..0ee29c3 100644 --- a/src/main/java/com/irtimaled/bbor/client/renderers/MobSpawnerRenderer.java +++ b/src/main/java/com/irtimaled/bbor/client/renderers/MobSpawnerRenderer.java @@ -1,10 +1,10 @@ package com.irtimaled.bbor.client.renderers; import com.irtimaled.bbor.client.Player; +import com.irtimaled.bbor.client.config.ConfigManager; import com.irtimaled.bbor.client.models.BoundingBoxMobSpawner; import com.irtimaled.bbor.common.models.Colors; import com.irtimaled.bbor.common.models.Coords; -import com.irtimaled.bbor.config.ConfigManager; import java.awt.*; diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/SlimeChunkRenderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/SlimeChunkRenderer.java index 47dea57..8fd38cb 100644 --- a/src/main/java/com/irtimaled/bbor/client/renderers/SlimeChunkRenderer.java +++ b/src/main/java/com/irtimaled/bbor/client/renderers/SlimeChunkRenderer.java @@ -1,8 +1,8 @@ package com.irtimaled.bbor.client.renderers; import com.irtimaled.bbor.client.Player; +import com.irtimaled.bbor.client.config.ConfigManager; import com.irtimaled.bbor.client.models.BoundingBoxSlimeChunk; -import com.irtimaled.bbor.config.ConfigManager; import java.awt.*; diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/SpawningSphereRenderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/SpawningSphereRenderer.java index 929ecb5..dc42331 100644 --- a/src/main/java/com/irtimaled/bbor/client/renderers/SpawningSphereRenderer.java +++ b/src/main/java/com/irtimaled/bbor/client/renderers/SpawningSphereRenderer.java @@ -1,10 +1,10 @@ package com.irtimaled.bbor.client.renderers; import com.irtimaled.bbor.client.Player; +import com.irtimaled.bbor.client.config.ConfigManager; import com.irtimaled.bbor.client.interop.SpawningSphereHelper; import com.irtimaled.bbor.client.models.BoundingBoxSpawningSphere; import com.irtimaled.bbor.common.MathHelper; -import com.irtimaled.bbor.config.ConfigManager; import net.minecraft.client.resources.I18n; import java.awt.*; diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/VillageRenderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/VillageRenderer.java index b064594..900943c 100644 --- a/src/main/java/com/irtimaled/bbor/client/renderers/VillageRenderer.java +++ b/src/main/java/com/irtimaled/bbor/client/renderers/VillageRenderer.java @@ -1,8 +1,8 @@ package com.irtimaled.bbor.client.renderers; +import com.irtimaled.bbor.client.config.ConfigManager; import com.irtimaled.bbor.common.models.BoundingBoxVillage; import com.irtimaled.bbor.common.models.Coords; -import com.irtimaled.bbor.config.ConfigManager; import org.lwjgl.opengl.GL11; import java.awt.*; diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/WorldSpawnRenderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/WorldSpawnRenderer.java index 921f01c..91aadbe 100644 --- a/src/main/java/com/irtimaled/bbor/client/renderers/WorldSpawnRenderer.java +++ b/src/main/java/com/irtimaled/bbor/client/renderers/WorldSpawnRenderer.java @@ -1,9 +1,9 @@ package com.irtimaled.bbor.client.renderers; import com.irtimaled.bbor.client.Player; +import com.irtimaled.bbor.client.config.ConfigManager; import com.irtimaled.bbor.client.models.BoundingBoxWorldSpawn; import com.irtimaled.bbor.common.models.Coords; -import com.irtimaled.bbor.config.ConfigManager; import java.awt.*; diff --git a/src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java b/src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java index 305e989..0dbfb79 100644 --- a/src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java +++ b/src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java @@ -3,7 +3,6 @@ package com.irtimaled.bbor.common.interop; import com.irtimaled.bbor.common.EventBus; import com.irtimaled.bbor.common.events.*; import com.irtimaled.bbor.common.models.ServerPlayer; -import com.irtimaled.bbor.config.ConfigManager; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.network.NetworkManager; @@ -11,15 +10,10 @@ import net.minecraft.world.WorldServer; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.gen.feature.structure.StructureStart; -import java.io.File; import java.util.Collection; import java.util.Map; public class CommonInterop { - public static void init() { - ConfigManager.loadConfig(new File(".")); - } - public static void chunkLoaded(Chunk chunk) { int dimensionId = chunk.getWorld().getDimension().getType().getId(); Map structures = chunk.getStructureStarts(); diff --git a/src/main/java/com/irtimaled/bbor/mixin/client/MixinMinecraft.java b/src/main/java/com/irtimaled/bbor/mixin/client/MixinMinecraft.java index b3213f4..5b500cd 100644 --- a/src/main/java/com/irtimaled/bbor/mixin/client/MixinMinecraft.java +++ b/src/main/java/com/irtimaled/bbor/mixin/client/MixinMinecraft.java @@ -2,7 +2,6 @@ package com.irtimaled.bbor.mixin.client; import com.irtimaled.bbor.client.ClientProxy; import com.irtimaled.bbor.client.interop.ModPackFinder; -import com.irtimaled.bbor.common.interop.CommonInterop; import net.minecraft.client.Minecraft; import net.minecraft.client.main.GameConfiguration; import net.minecraft.client.resources.ResourcePackInfoClient; @@ -21,7 +20,6 @@ public class MixinMinecraft { @Inject(method = "", at = @At("RETURN")) private void constructor(GameConfiguration configuration, CallbackInfo ci) { - CommonInterop.init(); clientProxy = new ClientProxy(); this.resourcePackRepository.addPackFinder(new ModPackFinder()); } diff --git a/src/main/java/com/irtimaled/bbor/mixin/server/dedicated/MixinDedicatedServer.java b/src/main/java/com/irtimaled/bbor/mixin/server/dedicated/MixinDedicatedServer.java index 983def3..193bb81 100644 --- a/src/main/java/com/irtimaled/bbor/mixin/server/dedicated/MixinDedicatedServer.java +++ b/src/main/java/com/irtimaled/bbor/mixin/server/dedicated/MixinDedicatedServer.java @@ -1,7 +1,6 @@ package com.irtimaled.bbor.mixin.server.dedicated; import com.irtimaled.bbor.common.CommonProxy; -import com.irtimaled.bbor.common.interop.CommonInterop; import net.minecraft.server.dedicated.DedicatedServer; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -12,7 +11,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; public class MixinDedicatedServer { @Inject(method = "init", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/dedicated/DedicatedServer;loadAllWorlds(Ljava/lang/String;Ljava/lang/String;JLnet/minecraft/world/WorldType;Lcom/google/gson/JsonElement;)V")) private void init(CallbackInfoReturnable cir) { - CommonInterop.init(); new CommonProxy().init(); } } -- 2.44.0