Commit graph

936 commits

Author SHA1 Message Date
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
06d2dcaa74 build 2013-12-22 17:19:06 -06:00
StevenRS11
6d64a54b75 Revert "build"
This reverts commit e7dcc20fad.
2013-12-22 17:18:16 -06:00
StevenRS11
399bb0ea9e Merge pull request #115 from SenseiKiwi/1.6-fixes
More Dungeons
2013-12-22 15:09:36 -08:00
SenseiKiwi
b929724781 Merge remote-tracking branch 'upstream/1.6.2-code' into 1.6-fixes 2013-12-22 19:06:12 -04:00
SenseiKiwi
b6669183bc More Dungeons
More dungeons for the Ruins pack. You'll never see it coming.
2013-12-22 19:05:04 -04:00
StevenRS11
82a17a2981 Merge pull request #114 from SenseiKiwi/1.6-fixes
Overhauled Loot
2013-12-22 14:44:14 -08:00
SenseiKiwi
f40f42298f Merge remote-tracking branch 'upstream/1.6.2-code' into 1.6-fixes 2013-12-22 18:39:46 -04:00
StevenRS11
e7dcc20fad build 2013-12-22 17:33:02 -05:00
SenseiKiwi
cfb370ad1f Minor Change
Removed a pointless SupressWarning annotation
2013-12-22 18:30:41 -04:00
SenseiKiwi
a6048c6c29 Overhauled Loot
Changed our loot generation. Instead of relying on Minecraft's built-in
loot categories, we now have our own static loot category. There are two
types of chests now. Regular chests contain randomly-picked coal, iron,
gold, diamonds, emeralds, quartz, enchanted books, and golden apples
(very rare). We also have a function for filling out "grave chests",
which occur in 1 out of every 7 chests. Those contain rotten flesh,
bones, and some armor pieces and equipment that are assigned random
damage values and occasionally also get level 1 enchantments. Small
changes were made to various files to incorporate this update.
2013-12-22 18:30:16 -04:00
StevenRS11
b3349ac3e3 build 2013-12-22 17:13:16 -05:00
StevenRS11
9bd9cfb700 Fixed rendering, simplified netcode 2013-12-22 16:53:13 -05:00
StevenRS11
4e0b7fa977 Fixed crashbug, now to fix rendering 2013-12-22 02:02:07 -05:00
StevenRS11
f88c314922 TESTING 2013-12-22 00:33:58 -05:00
StevenRS11
9f2d1b1109 more building 2013-12-21 23:32:48 -05:00
StevenRS11
2cc0b7e2ca Buildserver 2013-12-21 16:53:19 -05:00
SenseiKiwi
75e103aa65 Merge remote-tracking branch 'upstream/1.6.2-code' 2013-12-20 17:28:50 -04:00
StevenRS11
833e5d4e1c Merge pull request #112 from SenseiKiwi/rewrite
Fixed ClassCastException in DungeonPack
2013-12-20 00:01:21 -08:00
SenseiKiwi
13458029b4 Fixed ClassCastException in DungeonPack
Fixed a bug in DungeonPack that would trigger a rare ClassCastException
during dungeon selection. We were comparing instances of DungeonType
against WeightedContainer<DungeonType>. This wouldn't break dungeon
generation because DD falls back on selecting a random dungeon if
rule-based selection fails. It would allow duplicate dungeons to appear
in the same chain, though.
2013-12-20 01:10:55 -04:00
StevenRS11
51bd96dbe4 Merge pull request #111 from deathrat/1.6.2-code
1.6.2 code
2013-12-17 16:59:51 -08:00
deathrat
3e7ffe0d79 Updated gradlew permissions
Signed-off-by: deathrat <deathrat43@gmail.com>
2013-12-17 19:31:34 -05:00
deathrat
2ec43fc7d0 Fixed archive naming
Signed-off-by: deathrat <deathrat43@gmail.com>
2013-12-17 19:20:27 -05:00
StevenRS11
b83a766695 Merge pull request #110 from deathrat/1.6.2-code
Fixed problems with buildscript
2013-12-17 16:10:07 -08:00
deathrat
8d19d71d8a Fixed problems with buildscript
Signed-off-by: deathrat <deathrat43@gmail.com>
2013-12-17 19:09:53 -05:00
StevenRS11
f28f071095 Merge pull request #109 from deathrat/1.6.2-code
Added Gradle Wrapper and set build path for jar
2013-12-17 00:52:57 -08:00
deathrat
a8baba9430 Set jar path for Gradle Script
Signed-off-by: deathrat <deathrat43@gmail.com>
2013-12-17 03:51:25 -05:00
deathrat
6eedb45ded Added Gradle Wrapper
Signed-off-by: deathrat <deathrat43@gmail.com>
2013-12-17 03:48:27 -05:00
StevenRS11
31fc929170 Merge pull request #108 from deathrat/1.6.2-code
Support for ForgeGradle
2013-12-17 00:41:56 -08:00
deathrat
505b182af9 Created build.gradle
Restructured folder structure for ForgeGradle

Signed-off-by: deathrat <deathrat43@gmail.com>
2013-12-17 03:36:38 -05:00
StevenRS11
602b55111f one more time 2013-12-17 00:56:22 -06:00
StevenRS11
fd01d4e198 Fixing buildscript 2013-12-16 21:14:28 -06:00
StevenRS11
1931f7988c Merge pull request #107 from CannibalVox/master
Merging Canvox's patch
2013-12-16 18:58:44 -08:00
CannibalVox
81cc7053de Clarified network code & set linkdata to always be written to network
together.
2013-12-07 02:16:50 -06:00
CannibalVox
d9609ea60b Fix SMP issue in DD 1.6.4 2013-12-07 01:18:44 -06:00
CannibalVox
1205e85861 Remove unnecessary watcher value set command. 2013-12-07 00:36:54 -06:00
CannibalVox
1e6a4a8b4a A few build fixes 2013-12-06 21:48:16 -06:00
CannibalVox
7dc51a8e56 Fixed some merge issues. 2013-12-06 21:14:20 -06:00
CannibalVox
2388be2681 Merge branch '1.6.2-code' of github.com:StevenRS11/DimDoors
Conflicts:
	StevenDimDoors/mod_pocketDim/CraftingManager.java
	StevenDimDoors/mod_pocketDim/EventHookContainer.java
	StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java
	StevenDimDoors/mod_pocketDim/blocks/BlockDimWall.java
	StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java
	StevenDimDoors/mod_pocketDim/blocks/BlockDoorGold.java
	StevenDimDoors/mod_pocketDim/blocks/BlockGoldDimDoor.java
	StevenDimDoors/mod_pocketDim/blocks/BlockLimbo.java
	StevenDimDoors/mod_pocketDim/blocks/BlockRift.java
	StevenDimDoors/mod_pocketDim/blocks/TransTrapdoor.java
	StevenDimDoors/mod_pocketDim/commands/CommandCreateDungeonRift.java
	StevenDimDoors/mod_pocketDim/commands/CommandCreatePocket.java
	StevenDimDoors/mod_pocketDim/commands/CommandDeleteAllLinks.java
	StevenDimDoors/mod_pocketDim/commands/CommandDeleteRifts.java
	StevenDimDoors/mod_pocketDim/commands/CommandExportDungeon.java
	StevenDimDoors/mod_pocketDim/commands/CommandResetDungeons.java
	StevenDimDoors/mod_pocketDim/commands/CommandTeleportPlayer.java
	StevenDimDoors/mod_pocketDim/commands/DDCommandBase.java
	StevenDimDoors/mod_pocketDim/core/DDTeleporter.java
	StevenDimDoors/mod_pocketDim/core/NewDimData.java
	StevenDimDoors/mod_pocketDim/core/PocketManager.java
	StevenDimDoors/mod_pocketDim/helpers/ChunkLoaderHelper.java
	StevenDimDoors/mod_pocketDim/items/ItemBlockDimWall.java
	StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java
	StevenDimDoors/mod_pocketDim/items/ItemRiftSignature.java
	StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java
	StevenDimDoors/mod_pocketDim/mod_pocketDim.java
	StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java
	StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoorGold.java
	StevenDimDoors/mod_pocketDim/watcher/ClientLinkData.java
	StevenDimDoors/mod_pocketDim/world/CustomSkyProvider.java
	StevenDimDoors/mod_pocketDim/world/PocketBuilder.java
	StevenDimDoors/mod_pocketDimClient/RenderDimDoor.java
	StevenDimDoors/mod_pocketDimClient/RenderMobObelisk.java
	StevenDimDoors/mod_pocketDimClient/RenderTransTrapdoor.java
	build.xml
2013-12-06 21:09:14 -06:00
CannibalVox
e825cb74b9 1.6.4 basic fixes 2013-12-06 20:38:55 -06:00
StevenRS11
7687a77332 Chunkloader fixes 2013-11-12 13:56:52 -05:00
StevenRS11
b818038fd6 Chunkloader fixes 2013-11-12 13:49:43 -05:00
StevenRS11
b18fe877de Fixed commands and rift orientation 2013-11-12 13:16:54 -05:00
StevenRS11
8fbb41a588 fixed commands and rift orientation 2013-11-12 13:08:05 -05:00
StevenRS11
a1628ff341 Fixed monoliths 2013-11-11 22:05:11 -05:00
StevenRS11
8dd1d85e6e Fixed chunkloaders and loading bug 2013-11-11 21:49:47 -05:00
StevenRS11
9b6aefa6ad Fixed assets 2013-11-11 21:42:40 -05:00
StevenRS11
9907ce1ce8 removed debug 2013-11-11 21:40:28 -05:00