Commit graph

2467 commits

Author SHA1 Message Date
SenseiKiwi
a92cd2fba7 Merge remote-tracking branch 'upstream/DevBranch' into rewrite 2013-09-11 22:15:05 -04:00
SenseiKiwi
c2fa4964f8 Progress on New Save Format
Integrated the base code for our new save format. It still needs more
work but at least some substance is there. Ignore the file not found
messages that come up when trying to save the world's data - since we're
not actually writing files, an exception occurs when we some later code
tries to move non-existent save files.

Also moved the FileFilter functionality out of DungeonHelper and into
its own class, FileFilters, since it's finally needed more broadly.
2013-09-11 22:13:42 -04:00
StevenRS11
670b9a2902 Fixed door obstruction check to not trap people 2013-09-11 02:51:49 -04:00
SenseiKiwi
1d3038288b Minor Fix in BlockDimWall
Fixed an issue that skyboy had pointed out long ago about us using
ItemBlock.itemID as a block ID instead of ItemBlock.getBlockID(). That's
potentially hazardous because that function was introduced specifically
so mods could override it and decouple item IDs from block IDs.
2013-09-11 02:30:31 -04:00
SenseiKiwi
6f905050f2 Minor Change
Removed unused import
2013-09-11 01:21:12 -04:00
StevenRS11
78785047af Gold door completed, doors check for obstructions 2013-09-11 00:22:16 -04:00
SenseiKiwi
b73e79e5c2 Merge remote-tracking branch 'upstream/DevBranch' into rewrite 2013-09-10 15:51:00 -04:00
StevenRS11
08b36054ce Gold dim door working
Needs to gen the right type of door.
2013-09-10 15:50:15 -04:00
SenseiKiwi
687e66e23f Merge remote-tracking branch 'upstream/DevBranch' into rewrite 2013-09-10 15:49:06 -04:00
StevenRS11
52aa836f75 Added gold dim doors, fixes
Deleted the sun and adding gold dim doors
2013-09-10 04:32:19 -04:00
SenseiKiwi
b9edf3326d Merge remote-tracking branch 'upstream/DevBranch' into rewrite 2013-09-09 20:36:48 -04:00
StevenRS11
79349e9add Fixed door collision for minecarts 2013-09-09 16:47:47 -04:00
StevenRS11
678b5dac73 Tweaked a bit more 2013-09-09 05:33:21 -04:00
StevenRS11
46fc5a34f2 Fixed excessive scaling on DimDoors 2013-09-09 05:31:00 -04:00
StevenRS11
9d42565452 Revert "Working on render for DimDoors"
This reverts commit 2d085f60b8.
2013-09-09 05:29:53 -04:00
StevenRS11
17450dff60 Revert "OMGOMGOMG"
This reverts commit a368d85b54.
2013-09-09 05:29:44 -04:00
SenseiKiwi
51e396aa6b Merge remote-tracking branch 'upstream/DevBranch' into rewrite 2013-09-09 03:58:34 -04:00
StevenRS11
a368d85b54 OMGOMGOMG 2013-09-09 03:55:07 -04:00
SenseiKiwi
498e087d0a Merge remote-tracking branch 'upstream/DevBranch' into rewrite 2013-09-09 02:31:42 -04:00
SenseiKiwi
027b329af8 Completed Unsafe Exit Teleportation
Completed the code in yCoordHelper for choosing a point to drop the
player when using a Transdimensional Trapdoor. Made changes to
DDTeleporter so that the player can be dropped at the specific point we
want. This needs further testing, though, since I'm not completely sure
it's working right.
2013-09-09 02:31:11 -04:00
StevenRS11
2d085f60b8 Working on render for DimDoors 2013-09-09 02:28:17 -04:00
StevenRS11
a50650848c Merge pull request #87 from SenseiKiwi/rewrite
Fixed Transdimensional Trapdoor and More
2013-09-08 22:08:07 -07:00
SenseiKiwi
7dbc6896b1 Minor Fixes
Cleaned up obsolete code in PocketProvider and fixed the assignment of
hasNoSky so that it actually applies. Also overloaded getActualHeight()
so that we return 256 despite hasNoSky = true - the default MC behavior
is that we would return 128 in that case. Also undid a previous change
to EventHookContainer - players that die in pockets will respawn in
Limbo, again.
2013-09-09 00:42:03 -04:00
SenseiKiwi
9fec41f906 Minor Change
Renamed IDimDoor.placeDimDoor() to placeLink(), since that's what it's
actually being used for in our doors. Saying it places the door itself
is confusing.
2013-09-08 21:05:06 -04:00
SenseiKiwi
156c61a772 Improved DDTeleporter
Made a minor change to DDTeleporter - added a flag so that we can
specify that entities must be teleported to the destination without
trying to shift them around based on destination orientation. This is
important for the trapdoor, since otherwise entities might get shoved
into walls. Also cleaned up some code in DDTeleporter. It's much more
readable now. These changes are in preparation for completing Trans
Trapdoor destination selection.
2013-09-08 21:01:38 -04:00
SenseiKiwi
fc6dd63573 Minor Change
Renamed TransTrapdoor.isTrapdoorOnBlock() to
TransTrapdoor.isTrapdoorSetLow() so it would be easier to understand
what it indicates.
2013-09-08 16:48:16 -04:00
SenseiKiwi
4501e9373f Finished Merging Changes to Trapdoor
Merged together the different changes we had made to Transdimensional
Trapdoors. Cleaned up the rendering and tile entity code a bit, it
should be a little more understandable now.
2013-09-08 16:45:28 -04:00
SenseiKiwi
de5ef3b85f Renamed TileEntityDimHatch
Renamed TileEntityDimHatch to TileEntityTransTrapdoor. That matches the
name of the item we use in other parts of DD's code.
2013-09-08 15:31:17 -04:00
SenseiKiwi
37b0510676 Partially Improved Unsafe Exits
Partially completed the code for unsafe exits (used for trapdoors) so
that they drop players into air pockets. It's not complete yet, but I
want to merge in other changes before continuing.
2013-09-08 15:23:14 -04:00
SenseiKiwi
72213de437 Minor Change
Removed unused import in TransTrapdoor
2013-09-08 15:22:19 -04:00
SenseiKiwi
672c19b032 Improved Dim Door Collision Detection
Improved our code for checking whether an entity in contact with a door
should be teleported. Now the check works better, works for Minecarts,
and is more readable. It also ignores particle effect entities.
2013-09-08 15:22:03 -04:00
SenseiKiwi
44b39be7b7 Modified RiftFX Classes
Modifed the RiftFX classes so that their particles have noClip = true.
This avoids rifts spamming the collision events of other blocks,
including dimensional doors, and it should improve the performance of DD
a little.
2013-09-08 15:18:48 -04:00
StevenRS11
8dc47e8bef Added rendering effect to dimHatch 2013-09-08 02:49:36 -04:00
SenseiKiwi
f83841a142 Fixed Transdimensional Trapdoor
Got the Transdimensional Trapdoor working again. Renamed the file to
TransTrapdoor and trimmed off unnecessary code - BlockTrapDoor
implements a lot of the necessary logic. Implemented IDimDoor for
clarity.
2013-09-07 23:27:07 -04:00
SenseiKiwi
7280b54c47 Updated BlockRotator
Updated BlockRotator to check if a block is an instance of DoorBlock
instead of checking for BaseDimDoor - since we changed BaseDimDoor to
derive from DoorBlock, the latter check is no longer needed.
2013-09-07 22:16:47 -04:00
SenseiKiwi
fb59a3dacb Merge remote-tracking branch 'upstream/DevBranch' into rewrite 2013-09-07 22:05:11 -04:00
SenseiKiwi
b5d4df8f6a Updated LimboDecay
Updated LimboDecay to not affect certain blocks from DD. This matters in
case we decide to start placing gateways in Limbo again.
2013-09-07 21:35:15 -04:00
SenseiKiwi
703ec03d29 Stopped Cluster/Gateway Generation in The End
Added a condition preventing rift clusters and gateways from generating
in The End. It's not really useful to do that right now and could
actually cause some annoying side-effects.
2013-09-07 21:25:38 -04:00
SenseiKiwi
a0f9dfff4a Merge remote-tracking branch 'upstream/master' into rewrite 2013-09-07 20:23:53 -04:00
StevenRS11
665bcb3a0b Merge branch 'DevBranch' of https://github.com/StevenRS11/DimDoors into DevBranch 2013-09-07 20:22:11 -04:00
StevenRS11
3a63f8965b Merge pull request #86 from SenseiKiwi/rewrite
Progress on Rewrite
2013-09-07 17:22:03 -07:00
StevenRS11
87343b45ee Doors are finally doors, not chests! 2013-09-07 20:20:29 -04:00
SenseiKiwi
1d1d0a767c Fixed Doors and Minor Dungeon Change
Fixed the regression bug that caused some of our doors to get placed in
the wrong direction. Changing doors to inherit from BaseDimDoor caused
BlockRotator to assume they weren't dimensional doors because it used
"instanceof DimensionalDoor" to check. Thanks for figuring it out,
Steven! ^_^

Also made a minor change to dungeon generation. We now check the game
rule doMobSpawning and don't spawn Monoliths from DungeonSchematic if
the value is false. This is useful for testing without Monoliths around.
We still do work to remove the portal frame blocks even if the mobs
aren't spawned.
2013-09-07 20:14:14 -04:00
SenseiKiwi
921b6e88af Removed Rift Creation and Unused Settings
Removed the rift creation code from the Rift Blade and removed unused
settings from DDProperties. Specifically, the rift creation flag for the
Rift Blade, since that's getting removed, and the RiftSpreadModified,
which hasn't been referenced for a while.

I also cleaned up the code in Rift Blade slightly. Its special functions
worked during testing but blocking did not. I'm not sure why at the
moment.
2013-09-07 19:44:33 -04:00
SenseiKiwi
fd4b9b5086 Fixed Regression in DungeonSchematic
As part of the rewrite, I'd removed code related to replacing the
sandstone markers under dungeon exit doors, so the markers weren't being
replaced. Now that's working again.
2013-09-07 13:14:43 -04:00
SenseiKiwi
07a5e2a64d Progress on Rewrite
Completed exit door code. Also fixed noise calculation for dungeon door
destinations - we were attempting to use pack depth in the calculation
before it had been initialized.
2013-09-07 12:27:28 -04:00
SenseiKiwi
06c90572f1 Merge remote-tracking branch 'upstream/DevBranch' into rewrite 2013-09-07 05:12:30 -04:00
SenseiKiwi
25d3931210 Improved DDLoot
Fixed an issue with DDLoot where we couldn't distinguish between items
with the same ID but different subtypes while merging loot categories.
For instance, we could not include two different colors of dye in our
loot because their item IDs matched. We can now tell them apart properly
and include both items.
2013-09-07 05:12:07 -04:00
StevenRS11
26d4287b49 Merge pull request #85 from SenseiKiwi/rewrite
Partially Fixed Exit Doors
2013-09-06 22:01:58 -07:00
StevenRS11
2ce8dbff7b Merge branch 'DevBranch' of https://github.com/StevenRS11/DimDoors into DevBranch 2013-09-07 00:41:53 -04:00