Commit graph

670 commits

Author SHA1 Message Date
LemADEC
a161701abd Reactor balance pass with logs
Removed the "laser spam" double penalty
Fixed a few regression from the IC2 update
Added spamming logs to check the laser spam
2014-08-17 11:37:19 +02:00
LemADEC
bf65eda81e Added infos on power store block 2014-08-17 11:35:01 +02:00
LemADEC
ae82ba885f Let's keep it simple :) 2014-08-17 11:34:35 +02:00
LemADEC
e3e850848a Works better with textures... 2014-08-16 18:52:10 +02:00
LemADEC
b22b49fa9c Jump debuging logs 2014-08-16 18:17:10 +02:00
LemADEC
b7e739ff43 Reactor stats fix
Fixing IC2 power output not updating stats
2014-08-16 18:16:15 +02:00
LemADEC
566e71c288 Restructuration
Reorganised file structure
Code cleanup (ComputerCraft methods, dead variables, etc.)
2014-08-16 18:14:59 +02:00
LemADEC
1e05dc711a Merging air canister & fixing laser lift 2014-08-16 18:07:54 +02:00
LemADEC
3e12e537e3 Merging PowerStore & ItemUpgrade 2014-08-15 13:33:08 +02:00
LemADEC
512a38f629 Oups...
Missings from previous commit
2014-08-15 13:32:34 +02:00
LemADEC
51a4b6e099 Energy handling refactorization & some merging...
Reimplemented energyHandling from CoFH & IC2 reference designs
Added IC2 energy output support
Merged p1rx shipscanner energy handling
Merged DarlholmeTenk BlockContainer & new interfaces
Bumped WarpCore version
2014-08-15 13:31:24 +02:00
LemADEC
33e4e2a478 IC2 fixes & forgeMultipart support
Fixed a regression in handling IC2 tile entities
Added support for ForgeMultipart
Improved logs when exception was raised during jump phase
2014-08-15 02:41:17 +02:00
LemADEC
d149c44a7e Non-debug logs initial factorisation
Added global log print function
2014-08-15 02:40:01 +02:00
LemADEC
75a8fc915e Reactor laser fix
Fixed reactor stabilising with only 1 EU per second
2014-08-15 02:38:39 +02:00
Cr0s
597d216e33 Merge pull request #39 from p1rx/patch-1
Fixed scanning of GregTech machines with ShipScanner.
2014-08-13 20:52:26 +04:00
p1rx
e6ea013df4 Исправление сканирования грегомашин шипсканером. 2014-08-13 07:21:02 +04:00
LemADEC
f2921db45c Small optimisations to Camera registry, etc.
Updated monitor to only work with an empty hand
Removed useless calls to invalidate (Forge already do it)
Fixed Camera & LaserCamera not always removed from registry
Improved server & network load when updating Camera & LaserCamera
registration
Updated debug logs to state client/server side
2014-08-10 16:47:26 +02:00
LemADEC
147f4f4ebc Fixed memory leak & chunk (re)loading
Fixed camera registry reloading unloaded chunks
Fixed camera registry adding existing cameras
Refactored camera registry update
Fixed camera registry dead lock in debug environment
2014-08-10 16:26:00 +02:00
LemADEC
f74b3a7f67 Fix potential world corruption
Fixed Air generator handling of metadata to avoid world corruption
Removed unnecessary access to chunk data when updating textures
2014-08-10 16:21:11 +02:00
LemADEC
274d4964a7 Fixed comment on CoFH API source 2014-08-10 12:39:02 +02:00
LemADEC
b39b55c651 Merge pull request #4 from LemADEC/Cr0s-master
Added API for reference purpose
2014-08-09 12:40:04 +02:00
LemADEC
c2f8af5c2e Added API for reference purpose
Nota: CoFH API is no longer available on GitHUB for 1.6.4.
2014-08-09 12:11:21 +02:00
Cr0s
a26362de77 Merge pull request #38 from drpepper240/master
getFirstHit fix
2014-08-08 23:20:49 +04:00
drPepper
9657300764 getFirstHit fix 2014-08-08 20:52:26 +04:00
drPepper
c22c75cd1e Merge branch 'lasers' 2014-08-08 20:51:23 +04:00
drPepper
748d7e08b1 getFirstHit fix 2014-08-08 20:50:15 +04:00
drPepper
2204e7c139 Merge pull request #1 from ZLOFENIX/master
latest
2014-08-08 20:33:05 +04:00
Cr0s
68ae3bd965 Merge pull request #37 from Cr0s/revert-36-master
Revert "Merging DarkholmeTenk & my branches back to main"
2014-08-08 15:30:50 +04:00
Cr0s
f02ca71a70 Revert "Merging DarkholmeTenk & my branches back to main" 2014-08-08 15:29:16 +04:00
Cr0s
0a30aa3858 Merge pull request #36 from LemADEC/master
Merging DarkholmeTenk & LemADEC to Cr0s/WarpDrive/master
2014-08-08 15:04:36 +04:00
LemADEC
a2ce74e228 Merge pull request #3 from LemADEC/Cr0s-master
Merge the merge, back on master
2014-08-07 11:37:12 +02:00
LemADEC
da53d13792 Merge branch 'master' of https://github.com/Cr0s/WarpDrive into Cr0s-master
Conflicts:
	README.md
	src/assets/warpdrive/textures/blocks/camOverlay.png
	src/assets/warpdrive/textures/blocks/lasercamOverlay.png
	src/cr0s/WarpDrive/BlockAir.java
	src/cr0s/WarpDrive/CloakChunkWatcher.java
	src/cr0s/WarpDrive/CloakManager.java
	src/cr0s/WarpDrive/EntityCamera.java
	src/cr0s/WarpDrive/EntityJump.java
	src/cr0s/WarpDrive/JumpGatesRegistry.java
	src/cr0s/WarpDrive/PacketHandler.java
	src/cr0s/WarpDrive/SpaceEventHandler.java
	src/cr0s/WarpDrive/TileEntityMiningLaser.java
	src/cr0s/WarpDrive/TileEntityProtocol.java
	src/cr0s/WarpDrive/TileEntityRadar.java
	src/cr0s/WarpDrive/TileEntityReactor.java
	src/cr0s/WarpDrive/WarpCoresRegistry.java
	src/cr0s/WarpDrive/WarpDrive.java
	src/cr0s/WarpDrive/WarpDriveConfig.java
	src/cr0s/WarpDrive/machines/BlockCloakingCoil.java
	src/cr0s/WarpDrive/machines/BlockCloakingDeviceCore.java
	src/cr0s/WarpDrive/machines/BlockProtocol.java
	src/cr0s/WarpDrive/machines/BlockReactor.java
	src/cr0s/WarpDrive/machines/BlockShipScanner.java
	src/cr0s/WarpDrive/machines/TileEntityCloakingDeviceCore.java
	src/cr0s/WarpDrive/machines/TileEntityLaser.java
	src/cr0s/WarpDrive/machines/TileEntityShipScanner.java

Removed dead files
Fixed registry check for overlapping field
2014-08-07 11:31:39 +02:00
LemADEC
3433b3ad9a Merge last transporters fixes 2014-08-07 02:46:40 +02:00
LemADEC
d4f1459eb7 Reactor explosion revision
Nerfed block deletion around reactor explosion
Added TnTs to reactor explosion for a more (minecraft) natural feeling
Updated reactor laser explosion resistance
2014-08-07 02:46:00 +02:00
LemADEC
54a116a977 Merge pull request #1 from LemADEC/develop
Let's merge...
2014-08-07 02:37:51 +02:00
LemADEC
11621b6e50 Fixed reactor recipes 2014-08-06 00:53:47 +02:00
LemADEC
3b69bf2a0b Reactor balance in 'off' state + various fixes
Updated reactor to remain active after chunk (un)loading
Fixed reactor energy output too low at high instability
Reduced reactor initial production
Adjusted number of laser packets per cycle
Improved reactor robustness (protection for negative energy, etc.)
Fixed reactor API so computer gets current parameters
Fixed reactor API returning output rate per cycle instead of per tick
Refactored reactor mekanism (mode encoding, random number,  energy
generation & side textures refresh)
2014-08-06 00:53:21 +02:00
LemADEC
0f8bc14dec Configuration cleanup
Fixed AtomicScience support following its integration into
ResonantInduction
Extended Deuterium support when silk-touch mining (untested)
Added reactor recipes for IC2/TDK
2014-08-05 22:55:09 +02:00
LemADEC
ff65382235 Reactor balance & fixes
Updated reactor to increase power with instabilities so players want to
take the risk
Updated reactor offline state to remain unstable and loose its inerty
Fixed reactor texture glitches when exceeding limits (too unstable,
etc.)
Added reactor effective energy output for easier monitoring
Removed reactor usage as a battery (wip)
Minor fixes
2014-08-04 10:35:43 +02:00
LemADEC
b633953e51 Drowning nerf
Removed drowning air display (not working)
Updated drowning damage back to 2 in all cases
2014-08-04 10:32:48 +02:00
LemADEC
923ab61b9d oups...
Fixed reactor texture glitch
2014-08-03 20:32:46 +02:00
Cr0s
38872dab25 Merge pull request #35 from drpepper240/lasers
scanner laser improvement
2014-08-03 18:02:26 +04:00
ZLOFENIX
bcda6a7f12 Merge pull request #11 from drpepper240/lasers
Scanning lasers improvement
2014-08-03 17:59:25 +04:00
ZLOFENIX
726ec9be0e Merge pull request #10 from drpepper240/patch-1
ShipScanner output fix
2014-08-03 17:58:05 +04:00
LemADEC
8d919739dd Merge & cleanup, better oxygen
Merged Reactor & latests fixes
Updated a few functions to static
Removed dead code (casts, imports, etc.)
Fixed overlapped properties with local variables/parameters
Fixed parameters modifications
Added a few null-check
Added missing @Override

Updated WarpDrive block description to WarpDriveCore (players were
confused)
Updated cloaking core (removing frequency, add enable state)
Fixed Peripheral.equals checks
Fixed Camera falling
Added dirty fix for IC2 support in new reactor
Disabled oxygen for creative players and dead/invulnerable entities
Added tentative oxygen level display, increased drown damage
2014-08-03 14:05:04 +02:00
drPepper
2d191efb91 scanner laser improvement 2014-08-03 14:03:39 +04:00
Cr0s
ba6f35cce0 Merge pull request #34 from drpepper240/patch-1
shipscanner output fix
2014-08-02 17:35:07 +04:00
drpepper240
bb0af7baad ShipScanner output fix 2014-08-02 16:48:55 +04:00
Cr0s
72dde31aba Merge pull request #33 from drpepper240/master
BOLON fix
2014-08-02 14:54:49 +04:00
ZLOFENIX
0e74aae516 Merge pull request #9 from drpepper240/master
BOLON fix
через жопу и нулевую мету от капсулы воздуха
2014-08-02 14:49:09 +04:00