Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
DimDoors/StevenDimDoors/mod_pocketDim/EventHookContainer.java

97 lines
4 KiB
Java
Raw Normal View History

Signed-off-by: StevenRS11 <stevenrs11@aol.com>
2013-02-18 03:46:16 +01:00
package StevenDimDoors.mod_pocketDim;
Overhauled configuration properties Moved all configuration variables from mod_pocketDim to DDProperties (formerly DimDoorsConfig). Changed property names to be clearer in config file, modified some comments, and generally cleaned up the config file. Fixed some missing properties and variables that were reading from the wrong properties. Modified the order in which mod_pocketDim instantiated some of its static fields so that they would load after properties are read. Almost all classes load after properties are read. Fixed indentation across various files and replaced references to properties in mod_pocketDim with references to DDProperties.
2013-06-14 01:01:54 +02:00
Changed limbo trips to never kill the player Solves the player not getting inventory back, especially for special slots.
2013-09-06 21:36:12 +02:00
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ChunkCoordinates;
Fixed door render issue finally Signed-off-by: StevenRS11 <steven.r.stafford.ii.14@dartmouth.edu>
2013-03-22 05:58:55 +01:00
import net.minecraftforge.client.event.sound.SoundLoadEvent;
Changed limbo trips to never kill the player Solves the player not getting inventory back, especially for special slots.
2013-09-06 21:36:12 +02:00
import net.minecraftforge.event.EventPriority;
Signed-off-by: StevenRS11 <stevenrs11@aol.com>
2013-02-18 03:46:16 +01:00
import net.minecraftforge.event.ForgeSubscribe;
Changed limbo trips to never kill the player Solves the player not getting inventory back, especially for special slots.
2013-09-06 21:36:12 +02:00
import net.minecraftforge.event.entity.living.LivingDeathEvent;
Signed-off-by: StevenRS11 <stevenrs11@aol.com>
2013-02-18 03:46:16 +01:00
import net.minecraftforge.event.entity.living.LivingFallEvent;
import net.minecraftforge.event.world.WorldEvent;
Changed limbo trips to never kill the player Solves the player not getting inventory back, especially for special slots.
2013-09-06 21:36:12 +02:00
import StevenDimDoors.mod_pocketDim.core.DDTeleporter;
Flipped a Table Replaced several core classes from DD with new classes to enforce integrity checks. Rewriting everything that depended on those classes is a massive undertaking but it should simplify our code and prevent the many bugs we've seen lately. The rewrite isn't done yet, just committing my progress so far.
2013-08-29 08:14:24 +02:00
import StevenDimDoors.mod_pocketDim.core.PocketManager;
import StevenDimDoors.mod_pocketDim.ticking.RiftRegenerator;
Changed limbo trips to never kill the player Solves the player not getting inventory back, especially for special slots.
2013-09-06 21:36:12 +02:00
import StevenDimDoors.mod_pocketDim.util.Point4D;
import StevenDimDoors.mod_pocketDim.world.LimboProvider;
import StevenDimDoors.mod_pocketDim.world.PocketProvider;
Removed Limbo Decay Removed the code associated with Limbo decay from EventHookContainer, LimboBlock, and CommonTickHandler. DimHelper still has blocksToDecay since removing it could cause deserialization failures. However, nothing should actually use that list. I also removed several unused or redundant methods (e.g. overriding methods and putting in exactly the same code as in the super class), fixed indentation and renamed cryptic variables. We should have a rule against allowing cryptic variable names like "par2", even if they're inherited from Forge. I'll implement proper limbo decay in the next commit.
2013-07-25 06:12:13 +02:00
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
Overhauled configuration properties Moved all configuration variables from mod_pocketDim to DDProperties (formerly DimDoorsConfig). Changed property names to be clearer in config file, modified some comments, and generally cleaned up the config file. Fixed some missing properties and variables that were reading from the wrong properties. Modified the order in which mod_pocketDim instantiated some of its static fields so that they would load after properties are read. Almost all classes load after properties are read. Fixed indentation across various files and replaced references to properties in mod_pocketDim with references to DDProperties.
2013-06-14 01:01:54 +02:00
Signed-off-by: StevenRS11 <stevenrs11@aol.com>
2013-02-18 03:46:16 +01:00
public class EventHookContainer
{
More Progress on Rewrite Fixed the code in DDTeleporter and made minor changes to other classes that depended on those fixes. Ensured that PocketManager's load, save, and unload methods are called appropriately and rewrote some of their code. Made various changes in other classes (e.g. EventHookContainer, PlayerRespawnTracker) to pass them references to DDProperties through their constructors instead of having them rely on DDProperties.instance() - this is a better programming practice in the long run. Renamed initialization methods in mod_pocketDim to make it clear that they're called on events. Commented out command registration in mod_pocketDim so that we can test DD as soon as PacketHandler is fixed, without worrying about fixing the command classes.
2013-09-01 15:21:27 +02:00
private final DDProperties properties;
Overhauled configuration properties Moved all configuration variables from mod_pocketDim to DDProperties (formerly DimDoorsConfig). Changed property names to be clearer in config file, modified some comments, and generally cleaned up the config file. Fixed some missing properties and variables that were reading from the wrong properties. Modified the order in which mod_pocketDim instantiated some of its static fields so that they would load after properties are read. Almost all classes load after properties are read. Fixed indentation across various files and replaced references to properties in mod_pocketDim with references to DDProperties.
2013-06-14 01:01:54 +02:00
More Progress on Rewrite Fixed the code in DDTeleporter and made minor changes to other classes that depended on those fixes. Ensured that PocketManager's load, save, and unload methods are called appropriately and rewrote some of their code. Made various changes in other classes (e.g. EventHookContainer, PlayerRespawnTracker) to pass them references to DDProperties through their constructors instead of having them rely on DDProperties.instance() - this is a better programming practice in the long run. Renamed initialization methods in mod_pocketDim to make it clear that they're called on events. Commented out command registration in mod_pocketDim so that we can test DD as soon as PacketHandler is fixed, without worrying about fixing the command classes.
2013-09-01 15:21:27 +02:00
public EventHookContainer(DDProperties properties)
Overhauled configuration properties Moved all configuration variables from mod_pocketDim to DDProperties (formerly DimDoorsConfig). Changed property names to be clearer in config file, modified some comments, and generally cleaned up the config file. Fixed some missing properties and variables that were reading from the wrong properties. Modified the order in which mod_pocketDim instantiated some of its static fields so that they would load after properties are read. Almost all classes load after properties are read. Fixed indentation across various files and replaced references to properties in mod_pocketDim with references to DDProperties.
2013-06-14 01:01:54 +02:00
{
More Progress on Rewrite Fixed the code in DDTeleporter and made minor changes to other classes that depended on those fixes. Ensured that PocketManager's load, save, and unload methods are called appropriately and rewrote some of their code. Made various changes in other classes (e.g. EventHookContainer, PlayerRespawnTracker) to pass them references to DDProperties through their constructors instead of having them rely on DDProperties.instance() - this is a better programming practice in the long run. Renamed initialization methods in mod_pocketDim to make it clear that they're called on events. Commented out command registration in mod_pocketDim so that we can test DD as soon as PacketHandler is fixed, without worrying about fixing the command classes.
2013-09-01 15:21:27 +02:00
this.properties = properties;
Overhauled configuration properties Moved all configuration variables from mod_pocketDim to DDProperties (formerly DimDoorsConfig). Changed property names to be clearer in config file, modified some comments, and generally cleaned up the config file. Fixed some missing properties and variables that were reading from the wrong properties. Modified the order in which mod_pocketDim instantiated some of its static fields so that they would load after properties are read. Almost all classes load after properties are read. Fixed indentation across various files and replaced references to properties in mod_pocketDim with references to DDProperties.
2013-06-14 01:01:54 +02:00
}
Fixed door render issue finally Signed-off-by: StevenRS11 <steven.r.stafford.ii.14@dartmouth.edu>
2013-03-22 05:58:55 +01:00
@SideOnly(Side.CLIENT)
@ForgeSubscribe
public void onSoundLoad(SoundLoadEvent event)
{
respawn handler and config changes
2013-05-31 08:17:05 +02:00
event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/monk.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/monk.ogg")));
event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/crack.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/crack.ogg")));
event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/tearing.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/tearing.ogg")));
Rift blade is sword, added sounds
2013-07-15 08:45:25 +02:00
event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/rift.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/rift.ogg")));
event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/riftStart.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/riftStart.ogg")));
event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/riftEnd.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/riftEnd.ogg")));
event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/riftClose.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/riftClose.ogg")));
event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/riftDoor.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/riftDoor.ogg")));
Fixed door render issue finally Signed-off-by: StevenRS11 <steven.r.stafford.ii.14@dartmouth.edu>
2013-03-22 05:58:55 +01:00
}
Signed-off-by: StevenRS11 <stevenrs11@aol.com>
2013-02-18 03:46:16 +01:00
@ForgeSubscribe
public void onWorldLoad(WorldEvent.Load event)
{
Fixed More Bugs Fixed more bugs. Now it's possible to generate a world without crashing. Unfortunately, it's clear that there is a packet-sending loop going on. I'll have to add a check to prevent integrated servers from spamming themselves.
2013-09-04 00:28:42 +02:00
// We need to initialize PocketManager here because onServerAboutToStart fires before we can
// use DimensionManager and onServerStarting fires after the game tries to generate terrain.
// If a gateway tries to generate before PocketManager has initialized, we get a crash.
if (!PocketManager.isLoaded())
{
PocketManager.load();
}
if (PocketManager.isLoaded())
{
RiftRegenerator.regenerateRiftsInAllWorlds();
}
Signed-off-by: StevenRS11 <stevenrs11@aol.com>
2013-02-18 03:46:16 +01:00
}
Renamed printAllLinkData and limbo decay
2013-07-12 02:42:57 +02:00
Signed-off-by: StevenRS11 <stevenrs11@aol.com>
2013-02-18 03:46:16 +01:00
@ForgeSubscribe
public void onPlayerFall(LivingFallEvent event)
{
Removed Limbo Decay Removed the code associated with Limbo decay from EventHookContainer, LimboBlock, and CommonTickHandler. DimHelper still has blocksToDecay since removing it could cause deserialization failures. However, nothing should actually use that list. I also removed several unused or redundant methods (e.g. overriding methods and putting in exactly the same code as in the super class), fixed indentation and renamed cryptic variables. We should have a rule against allowing cryptic variable names like "par2", even if they're inherited from Forge. I'll implement proper limbo decay in the next commit.
2013-07-25 06:12:13 +02:00
event.setCanceled(event.entity.worldObj.provider.dimensionId == properties.LimboDimensionID);
Signed-off-by: StevenRS11 <stevenrs11@aol.com>
2013-02-18 03:46:16 +01:00
}
Renamed printAllLinkData and limbo decay
2013-07-12 02:42:57 +02:00
Changed limbo trips to never kill the player Solves the player not getting inventory back, especially for special slots.
2013-09-06 21:36:12 +02:00
@ForgeSubscribe(priority=EventPriority.HIGHEST)
public boolean LivingDeathEvent(LivingDeathEvent event)
Signed-off-by: StevenRS11 <stevenrs11@aol.com>
2013-02-18 03:46:16 +01:00
{
Changed limbo trips to never kill the player Solves the player not getting inventory back, especially for special slots.
2013-09-06 21:36:12 +02:00
Entity entity = event.entity;
Minor Changes Changed EventHookContainer.LivingDeathEvent() to use the player's max health instead of a fixed health value. No magic numbers! Also cleaned up the code a little.
2013-09-07 04:14:27 +02:00
if (entity instanceof EntityPlayer && entity.worldObj.provider instanceof PocketProvider
&& properties.LimboEnabled)
Changed limbo trips to never kill the player Solves the player not getting inventory back, especially for special slots.
2013-09-06 21:36:12 +02:00
{
Minor Changes Changed EventHookContainer.LivingDeathEvent() to use the player's max health instead of a fixed health value. No magic numbers! Also cleaned up the code a little.
2013-09-07 04:14:27 +02:00
EntityPlayer player = (EntityPlayer) entity;
if (!properties.LimboReturnsInventoryEnabled)
Respect keepLimboInventory config
2013-09-06 21:43:22 +02:00
{
Minor Changes Changed EventHookContainer.LivingDeathEvent() to use the player's max health instead of a fixed health value. No magic numbers! Also cleaned up the code a little.
2013-09-07 04:14:27 +02:00
player.inventory.clearInventory(-1, -1);
Respect keepLimboInventory config
2013-09-06 21:43:22 +02:00
}
Minor Changes Changed EventHookContainer.LivingDeathEvent() to use the player's max health instead of a fixed health value. No magic numbers! Also cleaned up the code a little.
2013-09-07 04:14:27 +02:00
ChunkCoordinates coords = LimboProvider.getLimboSkySpawn(player.worldObj.rand);
DDTeleporter.teleportEntity(player, new Point4D(coords.posX, coords.posY, coords.posZ, mod_pocketDim.properties.LimboDimensionID));
player.setEntityHealth(player.getMaxHealth());
Changed limbo trips to never kill the player Solves the player not getting inventory back, especially for special slots.
2013-09-06 21:36:12 +02:00
event.setCanceled(true);
Respect keepLimboInventory config
2013-09-06 21:43:22 +02:00
return false;
Changed limbo trips to never kill the player Solves the player not getting inventory back, especially for special slots.
2013-09-06 21:36:12 +02:00
}
return true;
Signed-off-by: StevenRS11 <stevenrs11@aol.com>
2013-02-18 03:46:16 +01:00
}
@ForgeSubscribe
public void onWorldsave(WorldEvent.Save event)
{
More Progress on Rewrite Fixed the code in DDTeleporter and made minor changes to other classes that depended on those fixes. Ensured that PocketManager's load, save, and unload methods are called appropriately and rewrote some of their code. Made various changes in other classes (e.g. EventHookContainer, PlayerRespawnTracker) to pass them references to DDProperties through their constructors instead of having them rely on DDProperties.instance() - this is a better programming practice in the long run. Renamed initialization methods in mod_pocketDim to make it clear that they're called on events. Commented out command registration in mod_pocketDim so that we can test DD as soon as PacketHandler is fixed, without worrying about fixing the command classes.
2013-09-01 15:21:27 +02:00
if (event.world.provider.dimensionId == 0)
Signed-off-by: StevenRS11 <stevenrs11@aol.com>
2013-02-18 03:46:16 +01:00
{
Flipped a Table Replaced several core classes from DD with new classes to enforce integrity checks. Rewriting everything that depended on those classes is a massive undertaking but it should simplify our code and prevent the many bugs we've seen lately. The rewrite isn't done yet, just committing my progress so far.
2013-08-29 08:14:24 +02:00
PocketManager.save();
Signed-off-by: StevenRS11 <stevenrs11@aol.com>
2013-02-18 03:46:16 +01:00
}
}
}
Reference in a new issue Copy permalink