From b6a7d4231a245a4d0ba772761319bd180c44944d Mon Sep 17 00:00:00 2001 From: syeyoung Date: Wed, 10 Feb 2021 17:58:54 +0900 Subject: lots of things --- .../dungeonsguide/roomprocessor/GeneralRoomProcessor.java | 8 +++++++- .../kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessor.java | 4 +++- .../roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java | 8 ++++---- .../bombdefuse/chambers/GeneralDefuseChamberProcessor.java | 2 +- .../roomprocessor/bossfight/BossfightProcessorBonzo.java | 2 +- .../roomprocessor/bossfight/BossfightProcessorLivid.java | 2 +- .../roomprocessor/bossfight/BossfightProcessorNecron.java | 2 +- .../roomprocessor/bossfight/BossfightProcessorProf.java | 2 +- .../roomprocessor/bossfight/BossfightProcessorSadan.java | 2 +- .../roomprocessor/bossfight/BossfightProcessorScarf.java | 2 +- .../roomprocessor/bossfight/GeneralBossfightProcessor.java | 7 ++++++- 11 files changed, 27 insertions(+), 14 deletions(-) (limited to 'src/main/java/kr/syeyoung/dungeonsguide/roomprocessor') diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/GeneralRoomProcessor.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/GeneralRoomProcessor.java index 68a43b36..9b86c36f 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/GeneralRoomProcessor.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/GeneralRoomProcessor.java @@ -20,6 +20,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentText; import net.minecraft.util.IChatComponent; import net.minecraftforge.client.event.GuiScreenEvent; +import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.event.entity.player.EntityInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; @@ -119,7 +120,7 @@ public class GeneralRoomProcessor implements RoomProcessor { } @Override - public void onEntitySpawn(LivingEvent.LivingUpdateEvent updateEvent) { + public void onEntityUpdate(LivingEvent.LivingUpdateEvent updateEvent) { } @Override @@ -136,6 +137,11 @@ public class GeneralRoomProcessor implements RoomProcessor { } + @Override + public void onEntityDeath(LivingDeathEvent deathEvent) { + + } + public static class Generator implements RoomProcessorGenerator { @Override public GeneralRoomProcessor createNew(DungeonRoom dungeonRoom) { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessor.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessor.java index c3d50e06..ff3b0ae3 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessor.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessor.java @@ -4,6 +4,7 @@ import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoom; import kr.syeyoung.dungeonsguide.events.PlayerInteractEntityEvent; import net.minecraft.util.IChatComponent; import net.minecraftforge.client.event.GuiScreenEvent; +import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.event.entity.player.EntityInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; @@ -19,7 +20,8 @@ public interface RoomProcessor { boolean readGlobalChat(); void onPostGuiRender(GuiScreenEvent.DrawScreenEvent.Post event); - void onEntitySpawn(LivingEvent.LivingUpdateEvent updateEvent); + void onEntityUpdate(LivingEvent.LivingUpdateEvent updateEvent); + void onEntityDeath(LivingDeathEvent deathEvent); void onKeyPress(InputEvent.KeyInputEvent keyInputEvent); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java index 4333be0a..c1db6045 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java @@ -313,8 +313,8 @@ public class RoomProcessorBombDefuseSolver extends GeneralRoomProcessor { } @Override - public void onEntitySpawn(LivingEvent.LivingUpdateEvent updateEvent) { - super.onEntitySpawn(updateEvent); + public void onEntityUpdate(LivingEvent.LivingUpdateEvent updateEvent) { + super.onEntityUpdate(updateEvent); if (bugged) return; BlockPos player = Minecraft.getMinecraft().thePlayer.getPosition(); @@ -322,12 +322,12 @@ public class RoomProcessorBombDefuseSolver extends GeneralRoomProcessor { for (ChamberSet ch:chambers) { if (ch.getLeft() != null && ch.getLeft().getProcessor() != null) { if (ch.getLeft().getChamberBlocks().getOffsetPointList().contains(offsetPoint)) { - ch.getLeft().getProcessor().onEntitySpawn(updateEvent); + ch.getLeft().getProcessor().onEntityUpdate(updateEvent); } } if (ch.getRight() != null && ch.getRight().getProcessor() != null) { // if (ch.getRight().getChamberBlocks().getOffsetPointList().contains(offsetPoint)) { - ch.getRight().getProcessor().onEntitySpawn(updateEvent); + ch.getRight().getProcessor().onEntityUpdate(updateEvent); // } } } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/chambers/GeneralDefuseChamberProcessor.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/chambers/GeneralDefuseChamberProcessor.java index 8069e3bc..41dde1fe 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/chambers/GeneralDefuseChamberProcessor.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/chambers/GeneralDefuseChamberProcessor.java @@ -69,7 +69,7 @@ public abstract class GeneralDefuseChamberProcessor implements ChamberProcessor } @Override - public void onEntitySpawn(LivingEvent.LivingUpdateEvent updateEvent) { + public void onEntityUpdate(LivingEvent.LivingUpdateEvent updateEvent) { } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorBonzo.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorBonzo.java index 60a8411b..2932b5a9 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorBonzo.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorBonzo.java @@ -54,7 +54,7 @@ public class BossfightProcessorBonzo extends GeneralBossfightProcessor { @Override // §e﴾ §c§lBonzo§r §e71k§c❤ §e﴿ // §e﴾ §c§lBonzo§r §a250k§c❤ §e﴿ - public void onEntitySpawn(LivingEvent.LivingUpdateEvent updateEvent) { + public void onEntityUpdate(LivingEvent.LivingUpdateEvent updateEvent) { if (updateEvent.entityLiving.getName().startsWith("§e﴾ §c§lBonzo§r ") && updateEvent.entityLiving instanceof EntityArmorStand) { bonzoStand = (EntityArmorStand) updateEvent.entityLiving; } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorLivid.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorLivid.java index b518fc07..64448edc 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorLivid.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorLivid.java @@ -31,7 +31,7 @@ public class BossfightProcessorLivid extends GeneralBossfightProcessor { put("Arcade", "§e"); }}; @Override - public void onEntitySpawn(LivingEvent.LivingUpdateEvent updateEvent) { + public void onEntityUpdate(LivingEvent.LivingUpdateEvent updateEvent) { if (updateEvent.entityLiving.getName().endsWith("Livid") && updateEvent.entityLiving instanceof EntityOtherPlayerMP) { if (!knownLivids.contains(updateEvent.entityLiving.getName())) { knownLivids.add(updateEvent.entityLiving.getName()); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorNecron.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorNecron.java index 85277e76..8988a29e 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorNecron.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorNecron.java @@ -53,7 +53,7 @@ public class BossfightProcessorNecron extends GeneralBossfightProcessor { @Override // §e﴾ §c§lBonzo§r §e71k§c❤ §e﴿ // §e﴾ §c§lBonzo§r §a250k§c❤ §e﴿ - public void onEntitySpawn(LivingEvent.LivingUpdateEvent updateEvent) { + public void onEntityUpdate(LivingEvent.LivingUpdateEvent updateEvent) { if (updateEvent.entityLiving.getName().contains("❤") && updateEvent.entityLiving instanceof EntityArmorStand) { System.out.println(updateEvent.entityLiving.getName()); } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorProf.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorProf.java index e45c4c02..2bb269f6 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorProf.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorProf.java @@ -104,7 +104,7 @@ public class BossfightProcessorProf extends GeneralBossfightProcessor { private EntityArmorStand reinforcedGuard; private EntityArmorStand healthyGuard; @Override - public void onEntitySpawn(LivingEvent.LivingUpdateEvent updateEvent) { + public void onEntityUpdate(LivingEvent.LivingUpdateEvent updateEvent) { if (updateEvent.entityLiving instanceof EntityArmorStand) { if (updateEvent.entityLiving.getName().startsWith("§e﴾ §c§lThe Professor§r ")) profStand = (EntityArmorStand) updateEvent.entityLiving; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorSadan.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorSadan.java index f38d6c02..60908de4 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorSadan.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorSadan.java @@ -104,7 +104,7 @@ public class BossfightProcessorSadan extends GeneralBossfightProcessor { private EntityArmorStand bigfootGiant; private EntityArmorStand boulderGiant; @Override - public void onEntitySpawn(LivingEvent.LivingUpdateEvent updateEvent) { + public void onEntityUpdate(LivingEvent.LivingUpdateEvent updateEvent) { if (updateEvent.entityLiving instanceof EntityArmorStand) { if (updateEvent.entityLiving.getName().startsWith("§e﴾ §c§lSadan§r ")) sadanStand = (EntityArmorStand) updateEvent.entityLiving; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorScarf.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorScarf.java index f6be7b52..a1ee7af2 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorScarf.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorScarf.java @@ -94,7 +94,7 @@ public class BossfightProcessorScarf extends GeneralBossfightProcessor { private EntityArmorStand berserkStand; private EntityArmorStand archerStand; @Override - public void onEntitySpawn(LivingEvent.LivingUpdateEvent updateEvent) { + public void onEntityUpdate(LivingEvent.LivingUpdateEvent updateEvent) { if (updateEvent.entityLiving instanceof EntityArmorStand) { if (updateEvent.entityLiving.getName().startsWith("§e﴾ §c§lScarf§r ")) scarfStand = (EntityArmorStand) updateEvent.entityLiving; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/GeneralBossfightProcessor.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/GeneralBossfightProcessor.java index 511bc62d..652206c2 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/GeneralBossfightProcessor.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/GeneralBossfightProcessor.java @@ -7,6 +7,7 @@ import net.minecraft.entity.boss.EntityDragon; import net.minecraft.util.IChatComponent; import net.minecraft.world.World; import net.minecraftforge.client.event.GuiScreenEvent; +import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.gameevent.InputEvent; @@ -86,7 +87,7 @@ public abstract class GeneralBossfightProcessor implements BossfightProcessor { } @Override - public void onEntitySpawn(LivingEvent.LivingUpdateEvent updateEvent) { + public void onEntityUpdate(LivingEvent.LivingUpdateEvent updateEvent) { } @@ -103,6 +104,10 @@ public abstract class GeneralBossfightProcessor implements BossfightProcessor { @Override public void onInteractBlock(PlayerInteractEvent event) { + } + @Override + public void onEntityDeath(LivingDeathEvent deathEvent) { + } public void onPhaseChange() {} -- cgit