Commit graph

1286 commits

Author SHA1 Message Date
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
Mathijs Riezebos
204e430be8 Created a backbone for saving DimDoors specific worldsave data 2017-01-12 15:15:53 +01:00
Mathijs Riezebos
ba6bf6be5a Merge remote-tracking branch 'refs/remotes/origin/master' into WIP 2017-01-12 12:44:49 +01:00
Mathijs Riezebos
30e8051306 Merge pull request #3 from Zixiken/1.10
Fixed DimWall functionality. Shift right disabling not working however.
2017-01-12 12:43:08 +01:00
Waterpicker
9f7da9b4b8 Fixed DimWall functionality. Shift right disabling not working however. 2017-01-12 05:25:04 -06:00
Mathijs Riezebos
1b2d4ad20a Implementing a way to handle rift-connections 001
Made a start
It doesn't compile yet
2017-01-12 01:11:55 +01:00
Mathijs Riezebos
db809a8219 Merge pull request #2 from Zixiken/1.10
1.10
2017-01-11 21:54:37 +01:00
Michael Zanga
0624b9f76a "Removed" deprecated code. 2017-01-11 15:27:06 -05:00
Michael Zanga
108a290c93 Unused import... 2017-01-11 14:23:14 -05:00
Michael Zanga
2cb880c6ca Item registration updated. Tweaks to ModelManager. 2017-01-11 14:19:21 -05:00
Michael Zanga
cc8f0326f0 Merge pull request #13 from Robijnvogel/master
Forge and Gradle updates
2017-01-11 12:24:57 -05:00
Mathijs Riezebos
1bd31a5d82 Solved compiler errors
Apparently "worldobj" was changed into "world" since the last Forge
update?
2017-01-11 15:47:37 +01:00
Mathijs Riezebos
3a282486d3 Setup
-Updated Gradle Wrapper and Forge version.
-Setup Netbeans
-Minor changes in MCMod.info
2017-01-11 15:42:29 +01:00
Mathijs Riezebos
64a424efe6 Merge pull request #1 from Zixiken/1.10
1.10
2017-01-11 15:28:24 +01:00
Michael Zanga
6f87336b6f Continued work on 1.10 updates. Block classes mostly done. 2016-12-13 15:57:45 -05:00
Waterpicker
bd6fc03350 Merge pull request #12 from Waterpicker/1.10
Updated forge version in prepration of sponge integration.
2016-12-13 13:31:29 -06:00
Waterpicker
64bf2acc75 Updated forge version in prepration of sponge integration. 2016-12-13 13:25:38 -06:00
Zangamj
22f22f4741 Potentially fixed #10 2016-11-13 17:40:49 -05:00
Michael Zanga
cb183e7ca4 Removed my JVM option from build.gradle 2016-11-13 17:05:20 -05:00
Waterpicker
35c3d1aae8 It compiles and runs in 1.10.2 2016-11-07 02:56:55 -06:00
Waterpicker
baf6e16620 Knocked out a chunk of updates to 1.10.2 2016-11-06 05:37:21 -06:00
Zangamj
7bb7b54cac Updated gradle scripts for 1.10.2. Still need to update code to 1.10.2 2016-11-05 22:36:33 -04:00
Zangamj
a9019d1d18 New base PocketProvider class 2016-11-05 21:26:27 -04:00
Michael Zanga
03a7fd1b47 Removed IDomDoor's seemingly useless initDoorTE method 2016-11-05 00:44:55 -04:00