MinecraftMods/Arias-Essentials
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Finish hooking stuff up

Browse source
This commit is contained in:
zontreck 2023-12-18 16:59:50 -07:00
parent 408e5d91d6
commit f8eb498f3c
5 changed files with 2 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/dev/zontreck/essentials/AriasEssentials.java
View file

@ -17,6 +17,7 @@ import dev.zontreck.essentials.events.TeleportEvent;
import dev.zontreck.essentials.gui.HeartsRenderer; import dev.zontreck.essentials.gui.HeartsRenderer;
import dev.zontreck.essentials.networking.ModMessages; import dev.zontreck.essentials.networking.ModMessages;
import dev.zontreck.essentials.networking.S2CUpdateHearts; import dev.zontreck.essentials.networking.S2CUpdateHearts;
import dev.zontreck.essentials.rtp.RTPCachesEventHandlers;
import dev.zontreck.libzontreck.events.RegisterPacketsEvent; import dev.zontreck.libzontreck.events.RegisterPacketsEvent;
import net.minecraftforge.fml.config.ModConfig; import net.minecraftforge.fml.config.ModConfig;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
@ -69,6 +70,7 @@ public class AriasEssentials {
MinecraftForge.EVENT_BUS.register(this); MinecraftForge.EVENT_BUS.register(this);
MinecraftForge.EVENT_BUS.register(new CommandRegister()); MinecraftForge.EVENT_BUS.register(new CommandRegister());
MinecraftForge.EVENT_BUS.register(new ForgeEventsHandler()); MinecraftForge.EVENT_BUS.register(new ForgeEventsHandler());
MinecraftForge.EVENT_BUS.register(new RTPCachesEventHandlers());
} }
@SubscribeEvent @SubscribeEvent

23
src/main/java/dev/zontreck/essentials/events/RTPNotCancelledEvent.java
View file

@ -1,23 +0,0 @@
package dev.zontreck.essentials.events;
import dev.zontreck.essentials.rtp.RTPContainer;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.Event;
/**
* Fired if the RTP Was not cancelled to signal that a warp should occur now!
*/
public class RTPNotCancelledEvent extends Event
{
public final RTPContainer container;
public RTPNotCancelledEvent(RTPContainer container)
{
this.container=container;
}
public void send()
{
MinecraftForge.EVENT_BUS.post(this);
}
}

8
src/main/java/dev/zontreck/essentials/rtp/RTP.java
View file

@ -1,26 +1,18 @@
package dev.zontreck.essentials.rtp; package dev.zontreck.essentials.rtp;
import dev.zontreck.ariaslib.util.DelayedExecutorService;
import dev.zontreck.ariaslib.util.Lists; import dev.zontreck.ariaslib.util.Lists;
import dev.zontreck.essentials.AriasEssentials; import dev.zontreck.essentials.AriasEssentials;
import dev.zontreck.essentials.Messages;
import dev.zontreck.essentials.events.RTPEvent;
import dev.zontreck.essentials.events.RTPNotCancelledEvent;
import dev.zontreck.libzontreck.util.ChatHelpers;
import dev.zontreck.libzontreck.vectors.Vector3; import dev.zontreck.libzontreck.vectors.Vector3;
import dev.zontreck.libzontreck.vectors.WorldPosition; import dev.zontreck.libzontreck.vectors.WorldPosition;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.core.Vec3i; import net.minecraft.core.Vec3i;
import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.level.ChunkPos;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.chunk.ChunkAccess;
import net.minecraft.world.level.chunk.ChunkStatus; import net.minecraft.world.level.chunk.ChunkStatus;
import net.minecraft.world.level.levelgen.Heightmap; import net.minecraft.world.level.levelgen.Heightmap;
import net.minecraftforge.common.MinecraftForge;
import java.time.Instant; import java.time.Instant;
import java.util.ArrayList; import java.util.ArrayList;

4
src/main/java/dev/zontreck/essentials/rtp/RandomPositionLocator.java
View file

@ -3,11 +3,7 @@ package dev.zontreck.essentials.rtp;
import dev.zontreck.ariaslib.terminal.Task; import dev.zontreck.ariaslib.terminal.Task;
import dev.zontreck.ariaslib.util.DelayedExecutorService; import dev.zontreck.ariaslib.util.DelayedExecutorService;
import dev.zontreck.essentials.AriasEssentials; import dev.zontreck.essentials.AriasEssentials;
import dev.zontreck.essentials.Messages;
import dev.zontreck.essentials.events.RTPEvent;
import dev.zontreck.essentials.events.RTPFoundEvent; import dev.zontreck.essentials.events.RTPFoundEvent;
import dev.zontreck.essentials.events.RTPNotCancelledEvent;
import dev.zontreck.libzontreck.util.ChatHelpers;
import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.ChunkPos;
import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.level.chunk.ChunkAccess;

23
src/main/java/dev/zontreck/essentials/util/ForgeEventsHandler.java
View file

@ -1,23 +1,11 @@
package dev.zontreck.essentials.util; package dev.zontreck.essentials.util;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.UUID; import java.util.UUID;
import dev.zontreck.essentials.AriasEssentials; import dev.zontreck.essentials.AriasEssentials;
import dev.zontreck.essentials.Messages;
import dev.zontreck.essentials.commands.teleport.TeleportActioner;
import dev.zontreck.essentials.commands.teleport.TeleportContainer;
import dev.zontreck.essentials.commands.teleport.TeleportDestination;
import dev.zontreck.essentials.events.RTPNotCancelledEvent;
import dev.zontreck.essentials.homes.HomesProvider; import dev.zontreck.essentials.homes.HomesProvider;
import dev.zontreck.libzontreck.chat.ChatColor;
import dev.zontreck.libzontreck.events.ProfileLoadedEvent; import dev.zontreck.libzontreck.events.ProfileLoadedEvent;
import dev.zontreck.libzontreck.events.ProfileUnloadedEvent; import dev.zontreck.libzontreck.events.ProfileUnloadedEvent;
import dev.zontreck.libzontreck.util.ChatHelpers;
import dev.zontreck.libzontreck.vectors.WorldPosition;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
@ -42,15 +30,4 @@ public class ForgeEventsHandler {
AriasEssentials.player_homes.remove(UUID.fromString(ev.user_id)); AriasEssentials.player_homes.remove(UUID.fromString(ev.user_id));
AriasEssentials.LOGGER.info("Homes unloaded"); AriasEssentials.LOGGER.info("Homes unloaded");
} }
@SubscribeEvent
public void onRTPNotCancelled(final RTPNotCancelledEvent ev)
{
final TeleportContainer contain = ev.container.container;
ChatHelpers.broadcastTo(contain.PlayerInst.getUUID(), ChatHelpers.macro(Messages.WARP_RTP_FOUND), contain.PlayerInst.server);
TeleportActioner.ApplyTeleportEffect(contain.PlayerInst);
TeleportActioner.PerformTeleport(contain);
}
} }