Commit graph

1359 commits

Author SHA1 Message Date
Mathijs Riezebos
49b88a9549 Made a lot of changes
If anything went wrong, assume that it's because of this commit.

Does not compile!
2017-01-25 14:10:50 +01:00
Mathijs Riezebos
d0b6a74664 Implemented usage of Sponge Schematics
-Implemented a way to load these schematics
-Implemented a way to place these schematics
-Removed "ye olde ways" (Pillar-ways)

Todo:
-Finding out how and where TileEntities are being created wrongly.
-Make pocket-generation a lot less "coupled". Just store the RiftIDs in
the Pocket and afterwards ask the pocket for a random RiftID
-Do some code cleanup in the SchematicHandler class
-Config Dim ID def: 684
2017-01-24 08:11:12 +01:00
Mathijs Riezebos
732ceee40b Changing plans about Pocket gen
-Added Schematic (loads itself) class to load and store schematic files
in memory.
-Removed dependency on Pillar mod

Todo:
-Code doesn't compile again
2017-01-24 05:27:14 +01:00
Waterpicker
6fc8e44dab Merged branch Items into 1.10-WIP 2017-01-23 20:01:37 -06:00
Waterpicker
4ce32c9828 Server and client are seperate. 2017-01-23 19:58:42 -06:00
Mathijs Riezebos
5c383bde1d Finished Pocket creation
-Added dependency on Vazkii's Pillar mod for "schematic" loading
-Added config directory for DimDoors
-Fixed entrance door placement coords
-Refractored some methods
-Added json-reader functionality

-Code compiles now

Todo:
-Make code added in SchematicHandler more modular
-Game gets stuck on world-load. Probably because the default json file
for "defaultPersonal" is not available yet at the saves directory.
2017-01-24 00:45:16 +01:00
Mathijs Riezebos
88dbcf152a Dungeon Pocket Template Randomisation
-Changed some method names
-Fixed a mistake in registering a new pocket upon generation
-Added some get functions for privates
-Implemented functionality for randomising what dungeon pocket may be
generated upon entering an unlinked DimDoor.

Todo:
-Still the same
2017-01-22 17:28:16 +01:00
Mathijs Riezebos
82b05010c3 Implemented preparation generation for pocket placement
-Valid Pocket schematics will be loaded on world-load
-Created an EnumPocketType instead of the integer to avoid confusion and
make expansion to more types easier.
-Renamed PocketPlacer to PocketTemplate
-Implemented Pocket-Template's placement of the default walls, floor,
roof and door
-Updated Forge to latest

Todo:
-Actually reading the schematic into memory
-Placing the schematic
2017-01-22 16:49:00 +01:00
Waterpicker
7554e3fc62 Rift Blade sorta works 2017-01-22 06:54:55 -06:00
Waterpicker
e027947fb0 Big batch of unfinished items. 2017-01-21 06:54:20 -06:00
Mathijs Riezebos
aac1108056 Cleaned up a little bit
Removed some useless privates from TileEntityDimDoor
Added some useful privates to DDTileEntityBase
2017-01-21 06:49:53 -06:00
Mathijs Riezebos
b68463fc62 Added config max and min values checker and correcter 2017-01-21 13:17:49 +01:00
Mathijs Riezebos
4d8378c8d0 Merge remote-tracking branch 'refs/remotes/origin/1.10-WIP' into 1.10-Pockets 2017-01-20 14:17:05 +01:00
Mathijs Riezebos
30b0e1a13b Fixed mostly visual things
-Added some crafting recipes
-Made some things render correctly
-Cooler texture for the Transdimensional Trapdoor
-Made some things show their name correctly
2017-01-20 14:08:27 +01:00
Waterpicker
eec27d5ef5 Rift blade renders correctly now 2017-01-20 05:42:03 -06:00
Mathijs Riezebos
c7535030a4 Wrote backbone for the Pocket Placement
-Added a configs class to handle the configs
-Rewrote some of the save handling of the RiftRegistry

Still needed:
-Some dimensions to place pockets in
-Actual loading of json and schematic files into memory
-Actual placement of the pockets (+ door placement and stuff)

Repo does not compile right now!¡!
2017-01-20 12:34:33 +01:00
Waterpicker
16416e35d4 Added rest of Item textures and semi implmentted the Rift Blade. 2017-01-20 03:54:26 -06:00
Mathijs Riezebos
8a36c6b1c0 Automatic Rift pairing with unpaired Rifts upon teleport 2017-01-20 01:44:40 +01:00
Mathijs Riezebos
5ebf7aab70 Rift Connection Tool basic visuals
Cleaned up a lot of logging code
Added a function to send chat messages to the player
2017-01-20 00:02:28 +01:00
Mathijs Riezebos
a9fb3f5445 Moar Teleporting fixing
Some renaming
And moving the storage of a DimDoor's orientation over from the
BlockDoorBase to the TileEntityDimDoor
2017-01-19 22:34:46 +01:00
Mathijs Riezebos
a9f2f3a82d More teleportation fixes
Made teleporting check whether door is opened and close it again on
teleportation.
Added some more debug logging.
Made the teleportation methods one "string" of boolean methods,
returning false if anything would go amiss.
Implemented 150 ticks waiting time inbetween teleports
finetuned getTeleportTargetLocation method, but it somehow gets reset on
server restart.
2017-01-19 16:28:18 +01:00
Waterpicker
8624934d26 Current modification 2017-01-19 00:51:22 -06:00
Mathijs Riezebos
3ffbe2ad03 Some small steps regarding teleportation 2017-01-19 06:23:46 +01:00
Mathijs Riezebos
30c86f1e16 Merge remote-tracking branch 'refs/remotes/origin/Teleportation' into 1.10-WIP
# Conflicts:
#	src/main/java/com/zixiken/dimdoors/blocks/BlockDimDoorBase.java
Removed a redundant method
#	src/main/java/com/zixiken/dimdoors/tileentities/DDTileEntityBase.java
Imports going amok
2017-01-19 04:17:00 +01:00
Mathijs Riezebos
ecc9ea39cf Privatized some variables
As a contingency against misuse
2017-01-19 04:13:04 +01:00
Mathijs Riezebos
111f2f9b51 Restructured Teleportation
Reshaped the teleportation implementation in a way so that it fits my
view on the structure. :P
Removed redundant methods
2017-01-19 04:06:13 +01:00
Mathijs Riezebos
987f52049f Insert random nonsensical title here
Removed some superfluous methods
Added stacktrace print whenever TileEntity gets created
2017-01-19 03:20:30 +01:00
Waterpicker
2767e36e2c Current code 2017-01-18 18:43:19 -06:00
Mathijs Riezebos
f93c4e3670 Added connecting rifts
Changed the functioning of and registered the ItemRiftConnectionTool
item.
Repaired a stupid mistake in DDTileEntityBase
2017-01-17 23:39:36 +01:00
Mathijs Riezebos
0c5ef6193c Rift connecting code implemented
Coded the ItemRiftConnectionTool's primary function
2017-01-17 04:18:42 +01:00
Mathijs Riezebos
ad29c72984 Merge remote-tracking branch 'refs/remotes/origin/Tesseract' into 1.10-WIP 2017-01-17 03:14:45 +01:00
Waterpicker
68881e17ce DimDoor and Rift- (re)placement
Main:
Removed "custom" code for DimDoors' Placement and rewrote it
When right-clicking rifts with any Dimensional Door, the game will try to place the Dimensional Door onto the rift.
Rifts will now enherit their properties from broken DimDoors and Dimdoors will enherit their properties from rifts they are placed over.

Other:
Made the DimDoors logger a bit more powerful.
Made RiftRegistry reset on server-load
Created a setup for the RiftConnectionTool Item.

Layout:
Fixed TileEntityRift.java's indentation
Changed some variable names

Authored by Robijnvogel and squashed by Waterpicker.
2017-01-16 20:12:14 -06:00
Waterpicker
9327a33674 New Tesseract Animation for Rift Tile Entitiies. 2017-01-16 20:04:32 -06:00
Mathijs Riezebos
1745d7b450 Merge remote-tracking branch 'refs/remotes/origin/1.10' into 1.10-WIP 2017-01-13 10:46:39 +01:00
Mathijs Riezebos
6ecee8d6ff Cleaned up Netbeans artifacts
as proposed in #16
2017-01-13 10:16:48 +01:00
Mathijs Riezebos
8eea287998 Some cleaning up, some making a mess
Changed the breakBlock method to something a bit more readable
Added some debug logging comments
2017-01-13 10:13:51 +01:00
Mathijs Riezebos
70535a50d5 Merge remote-tracking branch 'origin/1.10' into 1.10
# Conflicts resolved:
#	src/main/java/com/zixiken/dimdoors/blocks/BlockDimDoorBase.java
2017-01-13 09:40:16 +01:00
Mathijs Riezebos
5890211cc8 Trying to get DimDoors to turn into rifts on destruction 2017-01-13 09:37:42 +01:00
Waterpicker
d773db0256 Debug code rendering for rifts. 2017-01-13 02:26:46 -06:00
Waterpicker
8ef079b122 Added some last finishing touches on Dimensional walls.
Added some last finishing touches on Dimensional walls.
2017-01-13 00:49:24 -06:00
Mathijs Riezebos
e1facdbf3b Made Altered fabric work correctly 2017-01-13 00:49:24 -06:00
Mathijs Riezebos
2a4c9ba120 Door-placement- and rift-registering-fixes
-Due to testing, found out that "RiftRegistry.nextRiftID"gets saved and
loaded correctly.

-DimDoors are no longer placeable on leaves or glass (ItemDoorBase.java)
-DimDoors will no longer be placed through left-clicking
(EventHookContainer.java)
-Relocated call to DDTileEntityBase.register() from its constructor to
ItemDoorBase right after the door gets placed. Which means that that
whole constructor and its overrides in other classes are not needed
anymore.
-Added failsafe, so that a DDTileEntityBase that is already registered,
doesn't register again.
2017-01-13 07:45:45 +01:00
Mathijs Riezebos
b61aff025c Auto indented all code
No actual functionality was changed
2017-01-13 03:13:49 +01:00
Mathijs Riezebos
c741d5cd35 Set up actually registering Rifts
Repaired a derp I did in which the Tile Entities did not have a "World"
to get the ID from for the Location to turn into a Location. I needed to
change a lot of constructors to include said "World" as a parameter.

Set up DDTileEntityBase to save after it's paired, registered or
unpaired and actually wrote the readFromNBT and writeToNBT for that.
2017-01-13 03:07:26 +01:00
Mathijs Riezebos
b6d6d1270d Merge pull request #15 from Robijnvogel/master
Rift, Pocket and Rift-Link handling
2017-01-13 01:15:03 +01:00
Mathijs Riezebos
d72d015e16 Merge remote-tracking branch 'refs/remotes/origin/WIP' 2017-01-13 01:09:02 +01:00
Mathijs Riezebos
f68c9ec4a2 Connected Rift-Link system to rift registry- and saving- system
Merged functionality of "RiftHandler" class into "RiftRegistry" class
Moved the "Location" class

Why the RiftRegistry couples the Rift ID to the Rift **location** and
the PocketRegistry couples the Pocket ID to the actual Pocket
**instance**:
-Each Rift is a Tile-Entity, which means that it has its infromation can
be stored using the Tile-Entitiy's information saving system.
-Each Pocket is barely more than an information storage container, which
depends on having an external information saving system, which the
PocketRegistry provides for it.
2017-01-13 01:08:21 +01:00
Michael Zanga
7e3d87fcc1 Merge pull request #14 from Robijnvogel/master
Created a backbone for saving DimDoors specific worldsave data
2017-01-12 14:56:27 -05:00
Mathijs Riezebos
5c6fd1d1fa Adapted Save system to WIP changes 2017-01-12 16:00:51 +01:00
Mathijs Riezebos
12f715a4d7 Merge remote-tracking branch 'refs/remotes/origin/master' into WIP 2017-01-12 15:16:22 +01:00