Commit graph

1766 commits

Author SHA1 Message Date
Runemoro
d52206e538 Fix rift speed up and make portals render on both sides 2018-01-22 18:46:19 -05:00
Runemoro
932aa6857b Fix rift being invisible after breaking door 2018-01-22 17:46:50 -05:00
Runemoro
f7193289f3 Fix schematic place code (again) 2018-01-22 01:30:59 -05:00
Runemoro
ad9a779a18 Fix placing schematics at positions not multiples of 16, and fix null pointer with warp door 2018-01-22 01:00:53 -05:00
Robijnvogel
0e41140216 Transient Portals generate again!
- However now the game crashes on their generation, which probably has something to do with the recently added Cubic Chunks support.
2018-01-22 06:06:10 +01:00
Robijnvogel
86eacc4177 Updated FoamFix error message
- as a direct consequence of https://github.com/asiekierka/FoamFix/issues/105 being solved.
- Commented out some log spam.
2018-01-22 00:53:08 +01:00
Robijnvogel
06210605db Register new loot tables
- I forgot to do that :/
2018-01-22 00:13:52 +01:00
Robijnvogel
edb4497e1e Dispenser Loot Tables update
- Added Splash Potions, Tipped Arrows, Snow Balls and Spectral Arrows to the Dispenser loot table(s)

UNTESTED

Todo: add EnderMite and SilverFish eggs to these loot tables as well?
2018-01-22 00:06:11 +01:00
Waterpicker
aedc6216fd Added Fabric Convert Command. 2018-01-21 08:06:56 -06:00
Runemoro
a7dc1ad9b1 Small fixes and more default pockets
- Fix ExtendedStorageArray bug
 - Add more default pockets
 - Make blockData a short array rather than an int array, halving memory usage
2018-01-21 08:47:56 -05:00
Runemoro
f83492340b Merge branch '1.12-WIP' of https://github.com/DimensionalDevelopment/DimDoors into 1.12-WIP 2018-01-21 05:34:09 -05:00
Runemoro
e247bdb86e Cubic chunks support and schematic placement optimization 2018-01-21 05:34:06 -05:00
Robijnvogel
35e7a8b31e Changed generation chances to doubles
- Changed maximum generation chances "to compare with" to 1.0
 - Changed config values to doubles (and divided the default values by 10.000)

Why? Because "15 out of 10.000" is super trivial.
Now, if you set the chance to, for instance, 2.5 (out of 1), this means that there will generate exactly 2 gateways per chunk + a random chance of 1 out of 2 for a third one. Under 1.0 will still follow a normal distribution, though.
2018-01-21 09:36:06 +01:00
Robijnvogel
6aa2ab8d55 Found piece with FoamFix
- Removed soft FoamFix dependency
 - Sorted a switch case tree by key
 - Added conversion for that 1 World Thread in 1 dungeon
 - Made translateId method more sturdy by hardcoding some fall-back values, so FoamFix doesn't crash it anymore.
 - Changed Schematic author SK to full name: SenseiKiwi
2018-01-21 08:53:23 +01:00
Robijnvogel
6a2cb241ee FoamFix still causing issues
- Added minimum required and maximum allowd MC versions
 - Added setup for a minimum FoamFix version (for when they fix their Fast Hoppers)
 - Lowered the minimum required Forge version to 1.12.0's earliest version
 - Added workaround so FoamFix at least doesn't crash DimDoors for now
     - Maybe we should actually make this the default?
2018-01-21 05:44:01 +01:00
Robijnvogel
db6af71233 Merge branch '1.12-WIP' of https://github.com/DimensionalDevelopment/DimDoors into 1.12-WIP
- Fixed one conflict in PocketTemplate
2018-01-21 04:22:09 +01:00
Robijnvogel
94277e5fac Old Dungeons' inventory contents
- Added a method to dynamically fetch the NBT_TYPE of NBTStringTags
 - Made Loot only generate into empty inventories
 - Rewrote the Loot generation code, to make it more concise by reusing previously duplicate lines
 - Removed dispenser_fire loot table, because the dispensers that needed to light something, can now do so with their old 0-durability Flint 'n Steel
 - Succesfully spent 4 hours writing Item NBT conversion code for that one Written Book's contents that took me 20 seconds to convert manually
2018-01-21 04:07:47 +01:00
Runemoro
7764839257 Fix workaround for EnchantingTable 2018-01-20 19:47:56 -05:00
Runemoro
24393783da Split PocketLib and workaround for EnchantingTable 2018-01-20 18:30:53 -05:00
Robijnvogel
c9d9d1f076 Fixing broken chestloot
- Added a method to dynamically fetch the NBT_TYPE of NBTTagCompounds
 - Re-added StringUtils
 - Added a simple String Array search method to StringUtils
 - Added a counter for pistons and tnt
 - Removed counter for Warp Doors on Sandstone, because we know those amounts by now.
 - Fixed the TileEntity NBT not getting read properly
 - Split the block counters from other logic
 - Expressed my rage
 - Moved `rift.markStateChanged();` to later, so it only has to be done once in-code
 - Patched the conversion of that one Warp Door that was placed on SandStone on the bottom of a pocket.
 - Made sure that Transient Portals DO close after they have been passed through.
 - Removed double replacement of Monoliths
 - Made sure that @runemoro 's generic TileEntity generation code writes to the **output** list of TileEntities
2018-01-20 20:20:38 +01:00
Runemoro
1d6481429c Fix registry and transient door bugs 2018-01-20 02:38:51 -05:00
Runemoro
8358fe30c5 Add missing tile entities for all blocks, not just chests and dispensers, and don't overwrite previous entities if they were there 2018-01-19 23:45:08 -05:00
Runemoro
7c34879757 Merge branch 'schematic-creation' into 1.12-WIP and fix conflicts 2018-01-19 23:26:01 -05:00
Runemoro
86b58c2f9e Default dungeon templates
- Add setBlockState to Schematic
 - Add Schematic constructors that generate an air-filled pocket of the right size
 - Add blank pockets
 - Add void pockets
 - Make /pocket command takes you to center of pocket
 - Quick registry null pointer fix
2018-01-19 23:20:44 -05:00
Runemoro
d8d3fa4fc9 Fix /saveschem and support loading schematics from save folder 2018-01-19 18:49:27 -05:00
Waterpicker
9fa97d6ff2 Simplified SaveSchem Code 2018-01-19 16:36:04 -06:00
Runemoro
5f37c4721d Load schematics alphabetically and log time taken 2018-01-19 17:16:50 -05:00
Waterpicker
2b8a3e1c86 Hooked into the PocketRegistry 2018-01-19 15:18:37 -06:00
Runemoro
ec1261af08 Move pocket info from schematic name to JSON
- Transferred author, open/closed, and weight info to the json, added nice names for some of the dungeons
 - CamelCase -> snake_case
 - Removed _o suffix
 - Changed all "1" and "2" suffixes to "a" and "b" for conistency, added "a" suffix when there was a file with a "b" suffix
 - Removed all "a"/"1" suffixes when there was only one
2018-01-19 15:58:57 -05:00
Waterpicker
874fa612aa Added SaveSchem Command and added Entity Support 2018-01-19 14:16:52 -06:00
Robijnvogel
f7f1bab5fc Dispenser Loot
- Added loot tables for Dispensers
 - Added block counters for dispensers and valuable blocks to SchematicConverter
2018-01-19 20:19:42 +01:00
Waterpicker
be1c8ceda8 First Draft for creating a scheamtic from a chunk of the world. 2018-01-19 12:54:39 -06:00
Robijnvogel
f4131ac34e Lang Files
- Changed "Unstable" Door to "Chaos" Door everywhere in the code and resources.
 - Moved "colours" from en_US to en_GB and put 'Murican "colors" in their place.
 - Added lang keys for coloured ancient fabric
 - Complemented nl_NL lang file
 - Fixed the loot generation of Fabric of Reality in dungeon chests (Temporarily was Alternate Fabric, because of the 2 -> 16 colour change.)
2018-01-19 16:21:08 +01:00
Robijnvogel
a3a186a169 Updated version to Beta 6 2018-01-19 13:23:07 +01:00
Robijnvogel
5aaa671328 Colourful Fabric
-Added textures of Coloured Fabric Blocks
-Enabled all the Coloured Fabric (fullbright colour) blocks
-Added English lang names for Coloured Fabric
2018-01-19 13:21:04 +01:00
Runemoro
d8765c98db French and romanian translations of fabric colors 2018-01-19 07:10:55 -05:00
Runemoro
b9a0736072 Fix rift subregistry being written before riftRegistry is loaded, fix missing square root 2018-01-19 06:41:08 -05:00
Robijnvogel
a936a4280f Fixed Travis
-Changed build.gradle jar file versioning
-Fixed generatePocketSchematics task
-Made Travis use the correct version automatically
-Made Travis publish the sources as well as the binary
2018-01-19 10:36:46 +01:00
Robijnvogel
3d23749f34 Fixed server-sided Limbo music
-Fixed #35
-Changed the versioning format of jar files.
-Made Travis upload everything in the build folder.
2018-01-19 07:59:56 +01:00
Waterpicker
6a5321c35b Merge remote-tracking branch 'origin/1.12-WIP' into 1.12-WIP 2018-01-18 23:45:43 -06:00
Waterpicker
e7bf1b4b3a Hotfix for Sound code crashing. 2018-01-18 23:45:28 -06:00
Runemoro
25bf08ddfa Fix schematic conversion code for new blocks and null pointer in rift registry 2018-01-18 23:45:19 -05:00
Waterpicker
a62c461ff5 Added a new version of creepy to test. 2018-01-18 21:51:59 -06:00
Runemoro
d0509229c3 Beta 5 2018-01-18 22:42:46 -05:00
Runemoro
7011b7d751 Merge 'origin/background-music' and fix conflicts 2018-01-18 22:42:07 -05:00
Runemoro
7fb9e8bd85 Update pockets and fix registry recursion bug 2018-01-18 22:30:51 -05:00
Waterpicker
61487a14ab Looping Background Music in Limbo works 2018-01-18 21:23:01 -06:00
Runemoro
87416e442d Split the fabrics and implement colored fabric, fix #29 2018-01-18 21:14:00 -05:00
Waterpicker
f8daf5f68c Updated to to 2598 forge for per dimension music types. 2018-01-18 19:26:08 -06:00
Runemoro
92eb69c2e0 Implement transient entrances and rename them to transient portals 2018-01-18 14:24:09 -05:00