Commit graph

439 commits

Author SHA1 Message Date
Francesco Macagno
e8ef384681 Rearranged filler files 2015-08-22 22:08:42 -07:00
Francesco Macagno
c61a12ab22 Made compare include meta 2015-08-22 22:07:42 -07:00
Francesco Macagno
aa6de6177c Added features to MetaBlock 2015-08-22 15:50:41 -07:00
LemADEC
6538fb4929 Fixed reactor chamber crash regression 2015-08-22 14:27:21 +02:00
LemADEC
2d32fe465d Fixed uncloaking of vanilla entities and IC2 blocks 2015-08-22 13:43:18 +02:00
LemADEC
a22d66d3da Fixed cloaking to actually cloak 2015-08-22 13:40:10 +02:00
Francesco Macagno
564d638159 Started implementation of FillerSet 2015-08-20 23:33:59 -07:00
Francesco Macagno
a2df79bc01 Added MetaBlock to store block and metadata
Must be retrieved with MetaBlock.getMetaBlock(block, meta)
2015-08-20 23:20:15 -07:00
Francesco Macagno
3dc37dd969 Changed mod checking to occur at start
any element can now contain an attribute mods which should be a comma
seperated list of mods that are required
2015-08-20 22:43:35 -07:00
Francesco Macagno
19372a61a6 Added try to prevent crashes during world generation 2015-08-20 22:41:37 -07:00
Francesco Macagno
3e8d774941 Cleaned up Space generator to fit with WDConf 2015-08-20 22:41:10 -07:00
Francesco Macagno
5635441fc7 Removed old world gen block retrieval
If needed back, revert commit
2015-08-20 19:36:11 -07:00
LemADEC
0b2375e17f Code cleanup 2015-08-21 01:55:31 +02:00
LemADEC
9788ade634 Fixed IC2 support during jump
Fixed slow jump on big ships (regression due to 1.7 upgrade)
2015-08-20 11:50:46 +02:00
Francesco Macagno
1a765d2b34 Cleanup 2015-08-19 21:29:53 -07:00
Francesco Macagno
297a34a060 Changed mod requirements to be more general 2015-08-19 20:28:11 -07:00
LemADEC
c9365b6403 Fixed frequency network packet 2015-08-18 11:09:23 +02:00
Francesco Macagno
62c686c2ef Updated to use new ModReqChecker 2015-08-17 23:06:40 -07:00
Francesco Macagno
834f4f8b95 Changed OreManager to FillerManager
Also added new categories to match
2015-08-17 23:06:20 -07:00
Francesco Macagno
bb921c6907 Added generic mod checker 2015-08-17 23:04:22 -07:00
Francesco Macagno
f5821029bf Changed modlist to get text content 2015-08-17 22:49:38 -07:00
Francesco Macagno
c10847db1c Added new example xml files
None of these will work probably because the names are wrong
2015-08-17 22:48:48 -07:00
LemADEC
3f48734c05 Fixed #70 IC2 support during jump
Added workaround hack for IC2 API bug
Fixed IC2 tile entities signature
Fixed debug logging
Code cleanup
2015-08-18 03:58:58 +02:00
LemADEC
739f98904d Added root element to have valid xml
Added format version
2015-08-17 23:58:28 +02:00
LemADEC
e5cad85f0d Merge remote-tracking branch 'origin/MC1.7' into MC1.7
Conflicts:
	src/main/java/cr0s/warpdrive/conf/WarpDriveConfig.java
2015-08-17 11:46:03 +02:00
LemADEC
311f4cbe4f Added ability to unpack default XML files 2015-08-17 11:30:55 +02:00
LemADEC
736de5f273 Code cleanup 2015-08-17 11:26:43 +02:00
Francesco Macagno
87df1237fb Fix extension 2015-08-16 23:49:37 -07:00
Francesco Macagno
6b261e3c99 Started adding default file copy 2015-08-16 23:45:23 -07:00
Francesco Macagno
bd2155387d Adjusted OrbShell loading to fit LemADEC's modifications 2015-08-16 23:33:28 -07:00
Francesco Macagno
aa6601fee4 added ability to load structures from file 2015-08-16 23:29:22 -07:00
Francesco Macagno
80f05272b2 added default ore file 2015-08-16 23:17:46 -07:00
Francesco Macagno
94684560f6 Add name option to orb 2015-08-16 23:17:33 -07:00
LemADEC
c4e59f26b4 Disabled IC2 rotation support for now 2015-08-17 02:54:39 +02:00
LemADEC
bf2e325db3 Fixed gaz cloud generation crash when none was defined 2015-08-17 02:54:23 +02:00
LemADEC
9ee8220a1a Fixed ComputerCraft integration in world generation 2015-08-17 02:53:46 +02:00
LemADEC
8a7ebb649e Updated XML structure proposal 2015-08-17 01:49:31 +02:00
LemADEC
20fab3a8d9 Fixed #27
Added configuration for entity IDs
2015-08-16 23:13:13 +02:00
LemADEC
405ef74516 Fixed #61 ship controller script not booting 2015-08-16 22:48:23 +02:00
LemADEC
6841e99e11 Fixed mouse going to hypersensitivity on disconnection 2015-08-16 22:46:04 +02:00
LemADEC
df590ae2f0 Fixed laser medium peripheral name 2015-08-16 22:44:35 +02:00
LemADEC
f0c85aa421 Code cleanup 2015-08-16 22:44:20 +02:00
LemADEC
132ab7da5c Updated radar scripts
Added workaround for OC OpenOS bug on background color handling
Fixed title centering
Code cleanup
2015-08-16 18:24:04 +02:00
LemADEC
cd9b221e99 Fixed Enantiomorphic reactor control script
Added Mainframe control script
2015-08-16 17:22:57 +02:00
LemADEC
804a726184 Fixed world generation so it compiles 2015-08-16 16:52:53 +02:00
LemADEC
3f55176d81 Restored old ore generation until XML works 2015-08-16 16:51:17 +02:00
LemADEC
724f7337ee Fixed typo in Enantiomorphic reactor core name 2015-08-16 16:49:46 +02:00
LemADEC
c15e2c9bdf Code cleanup 2015-08-16 16:48:22 +02:00
Francesco Macagno
708fde795f Added basic loading
Need to create test cases
2015-08-15 21:44:34 -07:00
Francesco Macagno
700014dad4 renamed to add structures 2015-08-15 21:41:44 -07:00
Francesco Macagno
9fc0d07916 changed default moon type 2015-08-15 21:41:21 -07:00
Francesco Macagno
f09ec0cfaa Merge branch 'ConfImprovements' into MC1.7
Conflicts:
	src/main/java/cr0s/warpdrive/conf/WarpDriveConfig.java
2015-08-15 21:21:46 -07:00
Francesco Macagno
efd6d273f7 Cleaned up star a bit 2015-08-15 21:18:47 -07:00
Francesco Macagno
9b7d99c408 A little cleaning 2015-08-15 21:18:25 -07:00
Francesco Macagno
1e687cbf4c Started update to use new conf mechanics 2015-08-15 21:18:01 -07:00
Francesco Macagno
9f3c4d61df Added GasCloud 2015-08-15 21:17:30 -07:00
Francesco Macagno
5cf5d26fe1 Added GasCloud 2015-08-15 21:10:18 -07:00
Francesco Macagno
8b2129f4bc Refactored names and finished ore loading 2015-08-15 16:04:49 -07:00
LemADEC
8f14d0eb0e Improved default radar scripts
Added OpenComputers support
Code cleanup
2015-08-15 16:43:27 +02:00
LemADEC
3ff8d4fe10 Improved ship controller boot time slightly
Remaining is up to the players to tweak out :)
2015-08-15 16:41:41 +02:00
LemADEC
becfbac554 Improved ship controller boot delay
Down from 3 to 0.6 s with default startup script
This is a pre-requisite for the upcoming mainframe
2015-08-15 15:36:43 +02:00
LemADEC
1a3e60b53e code cleanup 2015-08-15 15:25:50 +02:00
LemADEC
0be0f272ab Improved jumpgates command 2015-08-15 15:25:36 +02:00
LemADEC
141f5d7efd Fixed camera handling, including #58
Fixed camera overlay remaining after disconnection
Removed crosshair in camera overlay
Refactored camera handling into its handler class
Fixed event registration sequencing (Init -> PreInit)
Added zoom factor display
Improved overlay scaling
Added a dedicated logging for camera to fix weapon/targetting mixup
2015-08-15 13:34:04 +02:00
YuRaNnNzZZ
a7fb566416 make air generator more configurable 2015-08-15 11:38:55 +03:00
YuRaNnNzZZ
a1f39a1ea6 remapping for highly advanced machine block 2015-08-15 11:14:55 +03:00
LemADEC
16f7e644ed Refactored zoom handling (1st pass)
Fixed zoom order and scaling so it's more user-friendly
Fixed zoom movement consistency
etc.
2015-08-15 04:35:34 +02:00
Francesco Macagno
0660941200 added getXmlDocumentBuilder 2015-08-14 18:50:47 -07:00
Francesco Macagno
4bbdf209a1 Finished orb implementation 2015-08-14 18:49:48 -07:00
LemADEC
18f4861a09 Code cleanup after merge
Updated to common coding rules
Refactored getModItemStack & isOpenComputersLoaded
2015-08-15 02:26:09 +02:00
LemADEC
11e67233ca Updated dependencies to latest 2015-08-15 01:44:59 +02:00
Francescco Macagno
3aafef59a6 Merge pull request #57 from LemADEC/MC1.7
Want to make sure i am working on newest additions
2015-08-14 16:23:21 -07:00
LemADEC
40282d41dd Merge branch 'MC1.7' of https://github.com/LemADEC/WarpDrive into MC1.7 2015-08-15 01:20:46 +02:00
LemADEC
daa0dec478 Fixed gravity management
Works in development environment too
2015-08-15 01:20:34 +02:00
Francesco Macagno
673752b26c Merge branch 'ConfImprovements' into HEAD
Conflicts:
	src/main/java/cr0s/warpdrive/WarpDrive.java
	src/main/java/cr0s/warpdrive/conf/WarpDriveConfig.java
2015-08-14 16:18:42 -07:00
LemADEC
c4211a254d Code cleanup 2015-08-15 01:11:26 +02:00
Francesco Macagno
6de4f42bb4 More improvements to orb 2015-08-14 15:59:54 -07:00
Francesco Macagno
3827ba5d60 Added skeleton StrucutreManager 2015-08-14 15:59:32 -07:00
Francescco Macagno
71afe5b86f Merge pull request #56 from YuRaNnNzZZ/MC1.7
Various additions
2015-08-14 15:54:52 -07:00
YuRaNnNzZZ
b510f84bbc well if this is what you want 2015-08-15 00:52:06 +03:00
LemADEC
548a471712 Fixed missing textures broken after remapping 2015-08-14 23:24:23 +02:00
YuRaNnNzZZ
1cbcd7b34f fix cc lua updater script 2015-08-14 23:20:01 +03:00
YuRaNnNzZZ
bcc0bf8675 fixed mod checking for recipes 2015-08-14 22:42:30 +03:00
YuRaNnNzZZ
fa090f0d0f finish russian localization 2015-08-14 21:30:12 +03:00
YuRaNnNzZZ
a94afc1931 Added remapping from old ids for existing worlds. 2015-08-14 20:52:20 +03:00
YuRaNnNzZZ
7c57c4b2e3 fix broken hard recipes and migrate hiadv machine to new style 2015-08-14 20:09:13 +03:00
YuRaNnNzZZ
c840e5a60a Merge branch 'MC1.7' into MC1.7fix
Conflicts:
	src/main/java/cr0s/warpdrive/WarpDrive.java
	src/main/java/cr0s/warpdrive/conf/WarpDriveConfig.java
	src/main/java/cr0s/warpdrive/render/ClientCameraUtils.java
	src/main/resources/assets/warpdrive/lang/en_US.lang
2015-08-14 19:42:04 +03:00
YuRaNnNzZZ
e1fc75efe8 Various fixes, hard ic2 recipes, new stones for worldgen and russian localization. 2015-08-14 19:35:54 +03:00
Francesco Macagno
7d98a42cfa Added all registered ores display
Test feature, may revert
2015-08-13 23:14:43 -07:00
LemADEC
0038e457e4 Fixed core so it's actually loading
Note: it won't work until node map is updated
2015-08-14 03:58:28 +02:00
LemADEC
2a1fc2ad37 Fixed logs for radar and breathing 2015-08-14 02:48:19 +02:00
LemADEC
63dcfc5f7e Re-added debug logs from comments 2015-08-14 02:09:00 +02:00
LemADEC
399cf8b6a2 Updated debug logs
Fixed #54
Replaced debug configuration with a logging section for finer adjustment
2015-08-14 01:51:50 +02:00
LemADEC
2a61625f7d Updated internal names consistency 2015-08-14 00:06:46 +02:00
LemADEC
04613742d4 Updated registration name for blocks and items (pass 2)
Fixed #39 (no comment)
Fixed #33
2015-08-13 23:54:01 +02:00
LemADEC
b83a14752a Updated internal classes and assets for blocks (pass 1) 2015-08-13 22:43:31 +02:00
Francesco Macagno
482f9c86ae Added OreManager to manage generic ore generation 2015-08-11 23:24:48 -07:00
Francesco Macagno
25573500e7 Add planetoid to represent planets 2015-08-11 20:19:16 -07:00
LemADEC
7beed32610 Fixed crossmod compatibility (#39) 2015-08-12 02:30:06 +02:00
Francesco Macagno
c5e38ee9be Added experimental planet definitions 2015-08-10 23:49:54 -07:00
Francesco Macagno
ce3b90c4be Changed Sun to Star 2015-08-10 23:24:24 -07:00
Francesco Macagno
2ed66dadda Merge branch 'ConfImprovements' into MC1.7
Conflicts:
	src/main/java/cr0s/warpdrive/WarpDrive.java
	src/main/java/cr0s/warpdrive/conf/WarpDriveConfig.java
2015-08-10 23:12:45 -07:00
LemADEC
c059622fd9 Fixed mining laser not filling chests 2015-08-11 03:27:49 +02:00
LemADEC
e0f300f0c7 Fixed air propagation on X+ #46 2015-08-11 00:11:03 +02:00
LemADEC
8c654aa395 Fixed mods integration in recipes & derelicts
Fixed #43 ?
2015-08-10 12:29:40 +02:00
LemADEC
b9635be24a Fixed #44 air not registering icons 2015-08-10 05:46:56 +02:00
LemADEC
aa0c5b49e1 Removed CC/OC debug logs 2015-08-10 05:46:18 +02:00
LemADEC
3efb18741b Forgot those 2 in previous commit... 2015-08-10 03:41:52 +02:00
LemADEC
5d60b93950 Fixed OpenComputers support
Refactored computer interfaces
Fixed entityUpdate late or missing ancestor calls
Added modid prefix to computer interface names
2015-08-10 03:39:44 +02:00
Francesco Macagno
2163ac7119 Moved existing sphere gen to new system 2015-08-09 17:02:08 -07:00
Francesco Macagno
7399caa896 Added Sun structure 2015-08-09 17:01:43 -07:00
Francesco Macagno
09308071e6 Added world gen loading strucutre 2015-08-09 17:01:28 -07:00
Francesco Macagno
65aebd3b58 Added new package and finished Orb implementation
Will still eventually need generate implementation, but not soon
2015-08-09 17:00:56 -07:00
LemADEC
36487aa409 Fixed computer API for particle booster 2015-08-09 23:43:29 +02:00
LemADEC
567b80a0ef Updated cloaking core name in LUA 2015-08-09 16:29:04 +02:00
LemADEC
16df2df5d9 Fixed OpenComputer API so it's actually exposed 2015-08-09 14:06:35 +02:00
LemADEC
4e5bd4cc00 Code cleanup (formating) 2015-08-09 13:55:36 +02:00
LemADEC
37cca74448 Fixed #41 crash on monitor right click 2015-08-09 13:48:09 +02:00
LemADEC
d9e4f528ba Fixed OpenComputer peripheral detection 2015-08-09 13:20:32 +02:00
LemADEC
e7d436aca3 Refactored cloaking assembly
- reduced CPU usage
- reduced network usage (redundant beams)
- added red gray color in case of low energy
- changed tier colors to green / blue, instead of green / red
- added more colors with smoother transitions
Improved packet sending debug logs
2015-08-09 06:10:08 +02:00
LemADEC
920d9521e6 Fixed ancestor calls derp (fixing cloaking assembly) 2015-08-09 05:08:12 +02:00
LemADEC
d7f2794a43 Code cleanup 2015-08-09 05:07:43 +02:00
LemADEC
c01ff627f8 Fixed debug logs and multiline chat messages 2015-08-09 05:07:19 +02:00
Francesco Macagno
372a98d620 Finished OrbShell implementation
Not the most memory efficient way, but very fast when deploying
2015-08-08 19:56:23 -07:00
LemADEC
a97e0ccf6c Refactored IC2 tiers so API remains to base class 2015-08-09 02:43:09 +02:00
LemADEC
c2f2259d82 Bumped to version 1.3.1 2015-08-08 15:46:59 +02:00
LemADEC
01d7d569ef Fixed new conf structure dependency 2015-08-08 15:11:48 +02:00
LemADEC
ffadef1496 Fixed IC2 and CoFHcore dependency at boot 2015-08-08 15:01:19 +02:00
LemADEC
9438fe5905 Refactored reactor core in WarpInterfacedTE
Also fixing a CC dependency at boot
2015-08-08 15:01:18 +02:00
LemADEC
e64fe092fa Fixed RF and EU power dependency 2015-08-08 15:01:17 +02:00
LemADEC
c75bc76d62 Fixed computer craft dependency at boot 2015-08-08 15:01:16 +02:00
LemADEC
4a0b26c356 Fixed IC2 dependency in Reactor laser focus & Ship scanner 2015-08-08 15:01:15 +02:00
Francesco Macagno
3d24dbce7a Adding new representations of deployable objects 2015-08-08 00:57:02 -07:00
Francesco Macagno
1467544a48 Forgot to add this back in 2015-08-07 23:28:52 -07:00
Francesco Macagno
c946425ee2 Beginning move to new conf structure 2015-08-07 23:28:12 -07:00
LemADEC
256b0b31d0 Tentatively fixed OpenComputers dependency 2015-08-07 03:47:57 +02:00
LemADEC
01b199e175 Fixed IC2 dependency in derelicts 2015-08-07 03:47:56 +02:00
Francesco Macagno
8c54aea0de Fixed localization 2015-08-04 19:24:35 -07:00
Francesco Macagno
4e9cfb4048 Fixed project setup in order to build properly
gradlew build works now
2015-08-03 20:59:48 -07:00