Backport updates
This commit is contained in:
parent
6cec3dcbbc
commit
728b2467a3
766 changed files with 32570 additions and 268 deletions
|
@ -5,27 +5,49 @@ import java.util.HashMap;
|
|||
import java.util.Map;
|
||||
import java.util.Random;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.ScheduledExecutorService;
|
||||
import java.util.concurrent.ScheduledThreadPoolExecutor;
|
||||
|
||||
import dev.zontreck.ariaslib.util.DelayedExecutorService;
|
||||
import dev.zontreck.essentials.antiexplode.CreeperHealQueue;
|
||||
import dev.zontreck.essentials.blocks.ModBlocks;
|
||||
import dev.zontreck.essentials.client.Keybindings;
|
||||
import dev.zontreck.essentials.client.renderer.TimeBoostEntityRenderer;
|
||||
import dev.zontreck.essentials.commands.teleport.TeleportActioner;
|
||||
import dev.zontreck.essentials.configs.client.AEClientConfig;
|
||||
import dev.zontreck.essentials.configs.server.AEServerConfig;
|
||||
import dev.zontreck.essentials.entities.ModEntities;
|
||||
import dev.zontreck.essentials.events.MainEventHandlers;
|
||||
import dev.zontreck.essentials.events.TeleportEvent;
|
||||
import dev.zontreck.essentials.gui.HeartsRenderer;
|
||||
import dev.zontreck.essentials.client.renderer.HeartsRenderer;
|
||||
import dev.zontreck.essentials.imc.Events;
|
||||
import dev.zontreck.essentials.items.CreativeModeTabs;
|
||||
import dev.zontreck.essentials.items.ModItems;
|
||||
import dev.zontreck.essentials.networking.ModMessages;
|
||||
import dev.zontreck.essentials.rtp.RTPCaches;
|
||||
import dev.zontreck.essentials.rtp.RTPCachesEventHandlers;
|
||||
import dev.zontreck.essentials.util.BackPositionCaches;
|
||||
import dev.zontreck.essentials.util.CommandCooldowns;
|
||||
import dev.zontreck.libzontreck.memory.world.BlockRestoreQueue;
|
||||
import dev.zontreck.libzontreck.memory.world.BlockRestoreQueueRegistry;
|
||||
import dev.zontreck.libzontreck.memory.world.SavedBlock;
|
||||
import dev.zontreck.libzontreck.util.ChatHelpers;
|
||||
import dev.zontreck.libzontreck.util.SNbtIo;
|
||||
import dev.zontreck.libzontreck.util.ServerUtilities;
|
||||
import dev.zontreck.libzontreck.vectors.Vector3i;
|
||||
import dev.zontreck.libzontreck.vectors.WorldPosition;
|
||||
import net.minecraft.client.renderer.entity.EntityRenderers;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.nbt.NbtUtils;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
|
||||
import net.minecraftforge.event.entity.living.LivingDeathEvent;
|
||||
import net.minecraftforge.event.level.ExplosionEvent;
|
||||
import net.minecraftforge.eventbus.api.EventPriority;
|
||||
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
|
||||
import org.slf4j.Logger;
|
||||
|
@ -53,6 +75,7 @@ public class AriasEssentials {
|
|||
public static boolean ALIVE;
|
||||
public static Map<UUID, Homes> player_homes = new HashMap<>();
|
||||
public static boolean DEBUG = true;
|
||||
public static ScheduledExecutorService executorService = Executors.newScheduledThreadPool(1);
|
||||
|
||||
|
||||
|
||||
|
@ -60,10 +83,11 @@ public class AriasEssentials {
|
|||
{
|
||||
IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus();
|
||||
bus.addListener(this::setup);
|
||||
DelayedExecutorService.setup();
|
||||
|
||||
LOGGER.info("/!\\ Loading Aria's Essentials Configuration Files /!\\");
|
||||
AEServerConfig.loadFromFile();
|
||||
AEClientConfig.loadFromFile();
|
||||
LOGGER.info("/!\\ DONE LOADING AECONFIG /!\\");
|
||||
|
||||
|
||||
|
||||
|
@ -75,8 +99,16 @@ public class AriasEssentials {
|
|||
MinecraftForge.EVENT_BUS.register(new RTPCachesEventHandlers());
|
||||
MinecraftForge.EVENT_BUS.register(new CommandCooldowns());
|
||||
MinecraftForge.EVENT_BUS.register(RTPCachesEventHandlers.class);
|
||||
MinecraftForge.EVENT_BUS.register(Events.class);
|
||||
MinecraftForge.EVENT_BUS.register(MainEventHandlers.class);
|
||||
|
||||
ModItems.register(bus);
|
||||
ModBlocks.register(bus);
|
||||
ModEntities.register(bus);
|
||||
CreativeModeTabs.register(bus);
|
||||
}
|
||||
|
||||
|
||||
@SubscribeEvent
|
||||
public void onTeleport(TeleportEvent event)
|
||||
{
|
||||
|
@ -99,8 +131,9 @@ public class AriasEssentials {
|
|||
public void onServerStart(final ServerStartedEvent ev)
|
||||
{
|
||||
ALIVE=true;
|
||||
// Print out the server config
|
||||
|
||||
|
||||
LOGGER.debug(NbtUtils.structureToSnbt(AEServerConfig.getInstance().serialize()));
|
||||
}
|
||||
|
||||
|
||||
|
@ -109,9 +142,6 @@ public class AriasEssentials {
|
|||
{
|
||||
ALIVE=false;
|
||||
LOGGER.info("Tearing down Aria's Essentials functions and tasks");
|
||||
DelayedExecutorService.stop();
|
||||
|
||||
DelayedExecutorService.getInstance().EXECUTORS.clear();
|
||||
RTPCaches.Locations.clear();
|
||||
}
|
||||
|
||||
|
@ -141,9 +171,17 @@ public class AriasEssentials {
|
|||
|
||||
LOGGER.info("Client setup");
|
||||
|
||||
EntityRenderers.register(ModEntities.TIAB_ENTITY.get(), TimeBoostEntityRenderer::new);
|
||||
MinecraftForge.EVENT_BUS.register(new HeartsRenderer());
|
||||
}
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
@SubscribeEvent
|
||||
public static void onRegisterKeyBinds(RegisterKeyMappingsEvent ev)
|
||||
{
|
||||
ev.register(Keybindings.AUTOWALK);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue