Commit graph

873 commits

Author SHA1 Message Date
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
439c13cc9f Merge branch 'master' of https://github.com/StevenRS11/DimDoors 2014-01-19 03:15:19 -05:00
StevenRS11
9aa9651a6d Fixed client dimData, link color, and nether doors 2014-01-19 03:15:07 -05:00
StevenRS11
3026432895 Merge pull request #127 from SenseiKiwi/master
Various Fixes
2014-01-18 22:07:38 -08:00
StevenRS11
ea2be9b803 Merging SenseiKiwi's merger 2014-01-19 00:59:24 -05:00
SenseiKiwi
37a10e5795 Resolved Merge Conflicts Again
...
2014-01-19 01:51:21 -04:00
SenseiKiwi
15cfe6fc33 Resolved Merge Conflicts
Resolved some merge conflicts.
2014-01-19 00:20:14 -04: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
SenseiKiwi
8416d650b1 Changed ID Source in BaseGateway
Changed where we get block IDs from for GatewayBlockFilter. DDProperties
always has correct block IDs. It's only item IDs that are modified by
Forge so that DDProperties is wrong.
2014-01-14 07:32:42 -04:00
SenseiKiwi
5df79bb206 Fixed ID Mapping in DungeonSchematic
Fixed issue with DungeonSchematic not standardizing the block IDs for
transient doors.
2014-01-14 07:22:51 -04:00
SenseiKiwi
75db61e951 Minor Change
There is no resource leak!
2014-01-14 07:18:05 -04:00
SenseiKiwi
1b2a119aa7 Fixed Placement in BaseGateway
Fixed bad gateway placement in BaseGateway. Also improved code spacing a
little. This doesn't fix the block ID issue yet.
2014-01-14 06:48:33 -04:00
SenseiKiwi
76f515e207 Minor Changes
Tweaked spacing in files.
2014-01-14 06:46:42 -04:00
SenseiKiwi
e45f9c389f Merge remote-tracking branch 'upstream/master' 2014-01-14 05:50:17 -04:00
SenseiKiwi
a1a5c0908a Fixes for Rifts
Fixed a bug I introduced during my previous commit that caused solo
rifts to spread and rifts with neighbors not to spread. Also cleaned up
the code a bit to cut back on the number of mysterious random rolls we
were using and commented the code.
2014-01-14 05:47:26 -04: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
73e3753d3b Merge pull request #125 from SenseiKiwi/master
More Dungeons
2014-01-09 14:28:45 -08:00
SenseiKiwi
ad92b1c2c4 Merge remote-tracking branch 'upstream/master' 2014-01-09 18:19:18 -04:00
SenseiKiwi
997e5ffda7 Added Nether Dungeon
Added another Nether maze
2014-01-09 18:18:21 -04: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
e6090d1a5f Added Another Dungeon
Added another dungeon...
2014-01-09 10:57:12 -04:00
SenseiKiwi
d479f40993 Added Dungeons
Added two new dungeons
2014-01-09 09:07:10 -04:00
StevenRS11
6a0cf4706a Merge pull request #124 from SenseiKiwi/master
Various Fixes
2014-01-05 20:16:28 -08: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
39f6d297cd Fixed Dungeons for MC 1.6
Fixed dungeons that were broken by changes in MC 1.6
2014-01-06 00:05:15 -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
StevenRS11
92801f1346 Merge pull request #123 from SenseiKiwi/master
Merged in Mazes and Nether Branches
2014-01-03 23:42:05 -08: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
SenseiKiwi
714120f96a Merge remote-tracking branch 'upstream/master' 2014-01-04 03:21:18 -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
4ebae55b17 Progress on Fixing Dungeons
Failed at fixing two dungeons for MC 1.6. I'll have to work around the
changes to block updates. >_o
2014-01-04 03:07:32 -04:00
SenseiKiwi
c0dec4caa3 Fixed Small Branch Room
Fixed a simple dungeon that had a problem with an extra sandstone block.
2014-01-03 18:46:41 -04:00
SenseiKiwi
d0aadd0eea Merge remote-tracking branch 'upstream/master' 2014-01-03 14:39:58 -04:00