Commit Graph

59 Commits

Author SHA1 Message Date
SenseiKiwi
238661158e Added Config for Corium
Added a line in our config file for setting the block ID of Corium. Even
though it's only temporary code that's going to be removed later, people
need that to run our dev builds properly.
2014-01-20 02:30:11 -04:00
SenseiKiwi
81386a08e5 Merge remote-tracking branch 'upstream/master' 2014-01-20 02:04:01 -04:00
StevenRS11
ad1f928db0 fixed gold Dim door not getting corners sometimes 2014-01-20 01:03:31 -05:00
SenseiKiwi
1d44bf2983 Started Adding Heads to Grave Chests
Started adding heads to grave chests in dungeons. We currently only
spawn skeleton heads as a test.
2014-01-20 02:01:35 -04:00
SenseiKiwi
b31cf9abd6 Minor Changes
Minor spacing changes to BaseDimDoor.
2014-01-20 02:00:34 -04:00
SenseiKiwi
30a9dcf2c7 Changed Rift Blade Recipe and Power
Changed Rift Blade recipe to use Stable Fabric and a Blaze Rod. Changed
its base material from Gold to Diamond, which increases attack power and
decreases enchantability a little.
2014-01-20 02:00:00 -04:00
StevenRS11
9fe071368e Working on rift remover strangeness 2014-01-19 22:15:12 -05:00
SenseiKiwi
ee1db9aa99 Updated Stabilized Rift Signature
Modified the Stabilized Rift Signature to consume Stable Fabric instead
of Ender Pearls.
2014-01-19 08:29:14 -04:00
SenseiKiwi
3b557aa88b Changed Crafting Recipes
Changed crafting recipes to always use Stabilized Fabric instead of
Ender Pearls.
2014-01-19 06:00:12 -04:00
SenseiKiwi
e469d2f7dc Added Ender Pearls as Loot
Added a 30% chance of Ender Pearls appearing in grave chests.
2014-01-19 05:14:39 -04:00
SenseiKiwi
026c0b4331 Merge remote-tracking branch 'upstream/master' 2014-01-19 05:01:11 -04:00
SenseiKiwi
2ea7fe731b Update Dungeon Loot and Config Options
1. Made World Thread available as dungeon loot
2. Removed useless config options for loot that doesn't appear anymore
3. Tweaked some config names and variable names for consistency
2014-01-19 05:00:42 -04:00
StevenRS11
8b108688f1 Clear status effects when entering limbo 2014-01-19 03:21:34 -05:00
StevenRS11
9aa9651a6d Fixed client dimData, link color, and nether doors 2014-01-19 03:15:07 -05:00
StevenRS11
ea2be9b803 Merging SenseiKiwi's merger 2014-01-19 00:59:24 -05:00
StevenRS11
80d828c252 Lots of fixes.
I also played around with fluids, and added something thats for BR. Its
not permanent here.
2014-01-18 18:35:11 -05:00
StevenRS11
0fcf02e75f Gateways nearly done, added sandstone gateways 2014-01-15 16:29:47 -05:00
StevenRS11
21267309a1 Cleaned up a bit 2014-01-14 18:54:30 -05:00
StevenRS11
0e4e36c454 Gateway generation now emulates old functionality 2014-01-14 13:40:27 -05:00
StevenRS11
9f00345065 Schematics give a new crash now. 2014-01-13 23:13:16 -05:00
StevenRS11
5f7d4ce971 More changes 2014-01-13 20:42:43 -05:00
StevenRS11
7dadef953d more work on gateways, plus tried to add a pack.
Gateway is generating, finally, but it has some... issues. Inquire
within.

Just generate a new world, and use an unstable door to warp to the first
that gens.
2014-01-13 17:49:13 -05:00
StevenRS11
1104961c54 added support for different dungeon gateways 2014-01-11 22:25:00 -05:00
StevenRS11
3369352143 Small fix
Made doors not continually crash servers, now they close if something
breaks.
2014-01-09 13:25:14 -05:00
SenseiKiwi
a8c3dfb524 Fixed Bug in DungeonSchematic
Fixed a bug in DungeonSchematic that would cause a mysterious
NullPointerException if a dungeon schematic was missing it's entrance
door.
2014-01-06 00:08:25 -04:00
SenseiKiwi
25f446a05b More Rift Fixes
--Changed BlockRift to use ITileEntityProvider instead of BlockContainer
--Reorganized some of the code in TileEntityRift to improve performance
and readability
2014-01-05 02:51:18 -04:00
SenseiKiwi
a5e5ea3921 Improvements to TileEntityRift
Cleaned up the code in TileEntityRift. Fixed up some spacing and changed
as many functions and fields to private as possible. Added a performance
improvement by doing the random roll for Enderman spawning before
searching for nearby Endermen.
2014-01-05 01:33:07 -04:00
SenseiKiwi
ab17a959bb Minor Change to Rifts
Changed rifts to using world.destroyBlock() instead of
world.setBlockToAir(). That has the advantage of causing block
destruction animations and sound effects instead of blocks vanishing
silently.
2014-01-05 01:13:12 -04:00
SenseiKiwi
cdc93317dd Fixed Indentation in TileEntityRift
Fixed indentation in TileEntityRift
2014-01-05 01:11:10 -04:00
SenseiKiwi
1211644f55 Minor Change
Changed some spacing
2014-01-05 01:08:09 -04:00
SenseiKiwi
ff24ce4de6 Minor Changes
Fixed indentation and removed pointless annotations.
2014-01-05 01:06:33 -04:00
SenseiKiwi
7ebc4e6ead Resolved Merge Conflicts
Resolved merge conflicts between recent bug fixes in DungeonSchematic
and some minor additions to the code from another branch.
2014-01-04 03:36:37 -04:00
SenseiKiwi
7aeaa46a47 Merge branch 'mazes' 2014-01-04 03:22:26 -04:00
StevenRS11
ab5ce1e652 Merge pull request #122 from StevenRS11/mazes
I derped. Oh well.
2014-01-03 23:15:16 -08:00
StevenRS11
394f92d5fc Fixed rending in pockets for doors
DDoors get a TE when they are generated now. May fix other bugs too, who
knows.
2014-01-04 01:10:33 -06:00
SenseiKiwi
63879b1851 Minor Change
Removed empty line
2013-12-31 15:13:29 -04:00
SenseiKiwi
f779915279 Minor Change
Deleted a line with a useless annotation.
2013-12-31 02:59:44 -04:00
SenseiKiwi
cee4005513 Reduced Floor Doorways
Added code to minimize the number of doorways that involve dropping
through the floor. Added a DisjointSet class as part of the
implementation. I also split the maze construction process into two
classes (MazeDesigner and MazeBuilder) to make it clearer.
2013-12-29 21:31:10 -04:00
StevenRS11
cd432c532f Rift balance change 2013-12-29 01:05:40 -06:00
SenseiKiwi
28cb2e5e74 Merge remote-tracking branch 'upstream/1.6.2-code' into mazes 2013-12-27 03:12:26 -04:00
StevenRS11
a0d0f6e19b Fixed chunk loading causing crash
Also might have increased pocket generation time
2013-12-27 01:08:50 -06:00
SenseiKiwi
82da53b992 Minor Change
Added blank lines to Point3D to space out functions. <_<
2013-12-26 15:29:42 -04:00
SenseiKiwi
820e72f17a Added First Step of Maze Generation
Added classes for generating maze dungeons. At the moment, the dungeons
are generated in place of our pocket dimensions to make testing easy.
We'll need to restore pocket generation later and integrate the mazes
into the dungeon packs later. Currently, the structures are very
incomplete (they don't even have doorways), but this is only the first
step.
2013-12-26 15:29:20 -04:00
StevenRS11
180720c04b Merge pull request #116 from SenseiKiwi/master
Fixed Saving Log Spam
2013-12-25 23:33:09 -08:00
StevenRS11
c3b3db4ca0 Lots of changes
Rerworked rift growth
Fixed teleport command
Fixed deleteRifts command
Fixed Rift rendering
2013-12-25 14:16:10 -06:00
SenseiKiwi
72196c6afd Fixed Saving Log Spam
Removed the code from PocketManager that would output messages about
saving dim data every so often since it was causing log spam.
2013-12-24 00:58:23 -04:00
SenseiKiwi
65ed1de6ee Merge remote-tracking branch 'upstream/1.6.2-code' into 1.6-fixes 2013-12-24 00:36:32 -04:00
SenseiKiwi
6d2c645ce9 Minor Changes
No changes to functionality
2013-12-24 00:36:02 -04:00
StevenRS11
6d64a54b75 Revert "build"
This reverts commit e7dcc20fad.
2013-12-22 17:18:16 -06:00
SenseiKiwi
f40f42298f Merge remote-tracking branch 'upstream/1.6.2-code' into 1.6-fixes 2013-12-22 18:39:46 -04:00