diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/DynamicSpawnControl.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/DynamicSpawnControl.java index 2a2998a..7ddfe5b 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/DynamicSpawnControl.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/DynamicSpawnControl.java @@ -2,7 +2,6 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLLoadCompleteEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; @@ -20,18 +19,14 @@ import org.imesense.dynamicspawncontrol.gameplay.recipes.CraftItemWeb; import org.imesense.dynamicspawncontrol.technical.eventprocessor.primitive.OnUpdateTimeWorld; import org.imesense.dynamicspawncontrol.technical.eventprocessor.primitive.OnWindowTitle; -import org.imesense.dynamicspawncontrol.technical.register.RegisterConfigClass; -import org.imesense.dynamicspawncontrol.technical.register.RegisterGameplayClass; -import org.imesense.dynamicspawncontrol.technical.register.RegisterCommandClass; +import org.imesense.dynamicspawncontrol.technical.register.*; import org.imesense.dynamicspawncontrol.technical.customlibrary.Log; import org.imesense.dynamicspawncontrol.technical.gamestructure.Structure; -import org.imesense.dynamicspawncontrol.technical.register.RegisterTechnicalClass; import org.imesense.dynamicspawncontrol.technical.network.MessageHandler; import org.imesense.dynamicspawncontrol.technical.network.PlayerInWebMessage; import org.imesense.dynamicspawncontrol.technical.parser.GeneralStorageData; import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript; import org.imesense.dynamicspawncontrol.technical.parser.ParserManager; -import org.imesense.dynamicspawncontrol.technical.proxy.IProxy; import org.imesense.dynamicspawncontrol.technical.worldcache.Cache; import org.imesense.dynamicspawncontrol.technical.worldcache.CacheStorage; @@ -68,15 +63,6 @@ public static File getGlobalPathToConfigs() return globalDirectory; } - /** - * Sided proxy settings - */ - @SidedProxy( - clientSide = "org.imesense.dynamicspawncontrol.technical.proxy.ClientProxy", - serverSide = "org.imesense.dynamicspawncontrol.technical.proxy.ServerProxy" - ) - public static IProxy Proxy; - /** * */ @@ -151,7 +137,7 @@ public synchronized void preInit(FMLPreInitializationEvent event) RegisterGameplayClass.registerClasses(); // - Proxy.preInit(event); + RegisterOreGenerator.init(event); } /** @@ -162,9 +148,6 @@ public synchronized void preInit(FMLPreInitializationEvent event) @Mod.EventHandler public synchronized void init(FMLInitializationEvent event) { - // - Proxy.init(event); - // Recipes = new CraftItemWeb(); @@ -182,9 +165,6 @@ public synchronized void init(FMLInitializationEvent event) @Mod.EventHandler public synchronized void postInit(FMLPostInitializationEvent event) { - // - Proxy.postInit(event); - //-' TODO: перенести это в отдельную инициализацию MinecraftForge.EVENT_BUS.register(new WebAttackEvent()); MinecraftForge.EVENT_BUS.register(new BreakTorchEvent()); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/ClientProxy.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/ClientProxy.java deleted file mode 100644 index 29a5674..0000000 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/ClientProxy.java +++ /dev/null @@ -1,99 +0,0 @@ -package org.imesense.dynamicspawncontrol.technical.proxy; - -import java.util.concurrent.Callable; - -import com.google.common.util.concurrent.ListenableFuture; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityPlayerSP; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import org.imesense.dynamicspawncontrol.technical.register.RegisterOreGenerator; - -/** - * Client sided proxy - */ -public final class ClientProxy implements IProxy -{ - /** - * Preinitialize modification - * - * @param event Preinitialization event - */ - @Override - public void preInit(FMLPreInitializationEvent event) - { - RegisterOreGenerator.init(event); - } - - /** - * Initialize modification - * - * @param event Initialization event - */ - @Override - public void init(FMLInitializationEvent event) - { - - } - - /** - * Postinitialize modification - * - * @param event Postinitialization event - */ - @Override - public void postInit(FMLPostInitializationEvent event) - { - - } - - /** - * Get client world instance - * - * @return Current world instance - */ - @Override - public World getClientWorld() - { - return Minecraft.getMinecraft().world; - } - - /** - * Get client player instance - * - * @return Current player instance - */ - @Override - public EntityPlayerSP getClientPlayer() - { - return Minecraft.getMinecraft().player; - } - - /** - * Add task to schedule for execution on client - * - * @param Type of task result - * @param callableToSchedule Task to complete - * @return Task result - */ - @Override - public synchronized ListenableFuture addScheduledTaskClient(Callable callableToSchedule) - { - return Minecraft.getMinecraft().addScheduledTask(callableToSchedule); - } - - /** - * Add task to schedule for execution on client - * - * @param runnableToSchedule Task to complete - * @return Task result - */ - @Override - public synchronized ListenableFuture addScheduledTaskClient(Runnable runnableToSchedule) - { - return Minecraft.getMinecraft().addScheduledTask(runnableToSchedule); - } -} diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/IProxy.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/IProxy.java deleted file mode 100644 index 21966fb..0000000 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/IProxy.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.imesense.dynamicspawncontrol.technical.proxy; - -import java.util.concurrent.Callable; - -import com.google.common.util.concurrent.ListenableFuture; - -import net.minecraft.client.entity.EntityPlayerSP; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; - -/** - * Sided proxy - */ -public interface IProxy -{ - /** - * Preinitialize modification - * - * @param event Preinitialization event - */ - void preInit(FMLPreInitializationEvent event); - - /** - * Initialize modification - * - * @param event Initialization event - */ - void init(FMLInitializationEvent event); - - /** - * Postinitialize modification - * - * @param event Postinitialization event - */ - void postInit(FMLPostInitializationEvent event); - - /** - * Get client world instance - * - * @return Current world instance - */ - World getClientWorld(); - - /** - * Get client player instance - * - * @return Current player instance - */ - EntityPlayerSP getClientPlayer(); - - /** - * Add task to schedule for execution on client - * - * @param Type of task result - * @param callableToSchedule Task to complete - * @return Task result - */ - ListenableFuture addScheduledTaskClient(Callable callableToSchedule); - - /** - * Add task to schedule for execution on client - * - * @param runnableToSchedule Task to complete - * @return Task result - */ - ListenableFuture addScheduledTaskClient(Runnable runnableToSchedule); -} diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/ServerProxy.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/ServerProxy.java deleted file mode 100644 index 09f6103..0000000 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/ServerProxy.java +++ /dev/null @@ -1,94 +0,0 @@ -package org.imesense.dynamicspawncontrol.technical.proxy; - -import java.util.concurrent.Callable; - -import com.google.common.util.concurrent.ListenableFuture; - -import net.minecraft.client.entity.EntityPlayerSP; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; - -/** - * Server sided proxy - */ -public final class ServerProxy implements IProxy -{ - /** - * Preinitialize modification - * - * @param event Preinitialization event - */ - @Override - public void preInit(FMLPreInitializationEvent event) - { - } - - /** - * Initialize modification - * - * @param event Initialization event - */ - @Override - public void init(FMLInitializationEvent event) - { - } - - /** - * Postinitialize modification - * - * @param event Postinitialization event - */ - @Override - public void postInit(FMLPostInitializationEvent event) - { - } - - /** - * Get client world instance - * - * @return Current world instance - */ - @Override - public World getClientWorld() - { - throw new IllegalStateException("The server cannot process this function, the call occurs from the client side!"); - } - - /** - * Get client player instance - * - * @return Current player instance - */ - @Override - public EntityPlayerSP getClientPlayer() - { - throw new IllegalStateException("The server cannot process this function, the call occurs from the client side!"); - } - - /** - * Add task to schedule for execution on client - * - * @param Type of task result - * @param callableToSchedule Task to complete - * @return Task result - */ - @Override - public synchronized ListenableFuture addScheduledTaskClient(Callable callableToSchedule) - { - throw new IllegalStateException("The server cannot process this function, the call occurs from the client side!"); - } - - /** - * Add task to schedule for execution on client - * - * @param runnableToSchedule Task to complete - * @return Task result - */ - @Override - public synchronized ListenableFuture addScheduledTaskClient(Runnable runnableToSchedule) - { - throw new IllegalStateException("The server cannot process this function, the call occurs from the client side!"); - } -}