Commit graph

133 commits

Author SHA1 Message Date
Krapht
21d5ae99c8 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-06-29 01:00:00 +02:00
Krapht
1d4b8b9279 Added shapeless reversal recipes for all gates AND <-> OR at the cost of a redstone circuit 2012-06-29 00:59:20 +02:00
SirSengir
3a162283bc Decreased amount of network updates required for engines significantly. 2012-06-28 23:08:00 +02:00
Krapht
abe7ef1b6a Added Sandstone pipe and waterproof pipe 2012-06-28 17:25:09 +02:00
Krapht
343f2b277b Added void pipes for items and liquids 2012-06-28 16:26:50 +02:00
Kyprus
afdf4d2ddf Removed a couple debug messages 2012-06-27 17:11:27 -04:00
Kyprus
03fcd8fabc Refactor of TileQuarry to fix the robot and laser in SMP. 2012-06-26 12:48:48 -04:00
Kyprus
d32f719cb6 Reverted accidental change and updated the build script. 2012-06-23 10:37:15 -04:00
Kyprus
783d0f8c1c Removed the devel files. 2012-06-23 10:31:42 -04:00
Kyprus
d1c686b6c3 Fixed the assembly table laser in SMP. 2012-06-23 10:06:43 -04:00
Kyprus
5d6031a8b1 Forgot a file. 2012-06-23 09:46:22 -04:00
Kyprus
c6574d77b6 Fixed assembly table not dropping items Fixes #63 2012-06-19 21:21:41 -04:00
Kyprus
e193bdbf46 A little enitty code cleanup. 2012-06-19 21:13:33 -04:00
Kyprus
a22568790a Merge pull request #58 from psxlover/CleanHead
Small enchancements
2012-06-15 10:41:54 -07:00
psxlover
0224e57357 Display an error message in the console when a ghost pipe is detected instead of printing the StackTrace. 2012-06-15 20:34:43 +03:00
psxlover
6ab4ad9044 Prevent addon pipes from becoming permanent ghosts. Now when the addon is used again the pipes should at least display again. 2012-06-15 20:31:57 +03:00
Kyprus
085737117b Couple small tweaks to TileGenericPipe 2012-06-15 13:27:45 -04:00
Kyprus
7150cbb30f Fixs for the PersistentWorld removal. Thanks psx 2012-06-15 13:10:51 -04:00
Kyprus
f1b9e30d88 Removed PersistentWorld/Tile +LegacyBlock support. 2012-06-15 12:23:08 -04:00
psxlover
6540aed3f9 Removed WorldIterator.java and WorldIteratorRadius.java since they are no longer used anywhere else.
Also small change and cleanup
2012-06-14 22:04:29 +03:00
psxlover
90905e38b3 Optimized Path Markers. Connecting should be instant and doesn't iterate all the blocks around the marker like before.
Now increasing the max range between the path markers wont increase the load of the cpu and the time to connect.
2012-06-14 21:53:40 +03:00
psxlover
422e1b048e Corrected a bug where the pathMarkers didn't save properly, that sometimes (depending on the order they were loaded) resulted in "lost" connections after a world load. 2012-06-14 19:31:41 +03:00
Kyprus
cd39bcf4b1 Fixed a couple texture paths. 2012-06-11 13:22:42 -04:00
Kyprus
8eb78d0e29 Fixed laser texture and jumping TileLaser. 2012-06-11 10:19:42 -04:00
Kyprus
d9a34f0ab1 Merge branch 'EntityRefactor'
Conflicts:
	buildcraft_client/net/minecraft/src/buildcraft/core/RenderLaser.java
	common/net/minecraft/src/BuildCraftCore.java
	common/net/minecraft/src/buildcraft/builders/TileBuilder.java
	common/net/minecraft/src/buildcraft/builders/TilePathMarker.java
	common/net/minecraft/src/buildcraft/core/EntityEnergyLaser.java
	common/net/minecraft/src/buildcraft/core/EntityLaser.java
	common/net/minecraft/src/buildcraft/core/EntityRobot.java
	common/net/minecraft/src/buildcraft/factory/EntityMechanicalArm.java
	common/net/minecraft/src/buildcraft/factory/TileQuarry.java
	common/net/minecraft/src/buildcraft/silicon/TileLaser.java
2012-06-10 19:19:34 -04:00
Kyprus
41cfa93e76 Lasers showing in SMP. 2012-06-10 19:08:16 -04:00
Krapht
31682c4c7b Fix texture paths 2012-06-10 21:32:35 +02:00
Kyprus
b872485663 Removed a couple debug messages. 2012-06-10 15:16:04 -04:00
Krapht
8d32860b3a Fix frame decay. Closes #23
Destroys TE when block is destroyed
2012-06-10 02:57:21 +02:00
Krapht
054c8ed792 Organize imports 2012-06-09 13:41:28 +02:00
SirSengir
e1de3ecd1a Moved resources to seperate directory.
Fixed a NPE in assembly table on SSP.
2012-06-08 11:49:14 +02:00
SirSengir
c420b80716 Fixed incorrect inheritance. 2012-06-08 10:59:48 +02:00
Kyprus
e78fcf297c Code cleanup attempt #2 2012-06-07 20:17:08 -04:00
SirSengir
76ea5f4b91 Added mcmod.info for FML.
Small refactoring.
2012-06-08 00:58:25 +02:00
Kyprus
59ee83677b Fixing conflict resolutions derps. 2012-06-07 18:54:28 -04:00
Kyprus
e984ac27a0 Work on the laser in SMP. 2012-06-07 18:51:16 -04:00
Kyprus
1c2c729c36 Fix for multiple quarry arms. 2012-06-07 18:26:16 -04:00
Kyprus
65895a1cfc More entity refactoring 2012-06-07 18:24:37 -04:00
Krapht
f4409810d6 Hopper:
Now pushes topleft stack instead of bottom one
Does not manipulate client inventory in SMP
Code cleanup
Closes #47
2012-06-06 13:17:33 +02:00
SirSengir
d474612978 Code cleanup. 2012-06-04 22:48:18 +02:00
SirSengir
15d239a6a9 Hopper now drops inventory contents when broken. Closes #46 2012-06-04 22:45:16 +02:00
SirSengir
90f3466960 Fixed issues when picking up engines of different types. Closes #42 2012-06-04 22:30:23 +02:00
SirSengir
175703ddf2 Added Forestry-style energy ledger to engines. 2012-06-03 13:41:41 +02:00
SirSengir
6f8d594197 Pipe wires are synched on first connect of client. Wire signal synching is still missing. 2012-06-03 11:48:15 +02:00
CovertJaguar
294a3a5008 Should fix black laser beams. 2012-05-31 04:56:34 -07:00
Krapht
5940f6026d Pickup items after digging
Increase pickup range
2012-05-31 00:40:28 +02:00
Kyprus
b3afe87210 Bumped the range on sending packets to 128. 2012-05-30 14:06:28 -04:00
Kyprus
5022848678 Fixed quarry NPE and lasers not showing
For #20
2012-05-30 10:42:37 -04:00
SirSengir
9077e9dedf Improved diamond pipe client synch. 2012-05-30 12:27:30 +02:00
Kyprus
f4a018c286 Made the robot build again.
Build still needs a rewrite.
2012-05-30 01:56:39 -04:00
Kyprus
9dc2c768fa Starting refactor of the robot and laser entites.
For issue #20
2012-05-30 01:50:44 -04:00
Krapht
44973bc2b1 Fix gate sync to server
Fix gate values to client
2012-05-28 02:39:39 +02:00
Kyprus
73506ba153 Revert "Merge branch 'TransportSecure'"
This reverts commit a6872c5053, reversing
changes made to ff20f682fc.
2012-05-27 15:53:52 -04:00
SirSengir
999d26eb23 Fixed previous commit. 2012-05-27 11:29:37 +02:00
SirSengir
a6872c5053 Merge branch 'TransportSecure' 2012-05-27 11:20:17 +02:00
SirSengir
ff20f682fc Suppress pipe stripping client side. 2012-05-27 11:19:11 +02:00
psxlover
50a4fa1ea0 A exception that was already being caught. 2012-05-27 09:58:35 +02:00
psxlover
37cac720e6 Fixed filler respawning striped tape after it gets destroyed. 2012-05-27 09:56:32 +02:00
psxlover
6ccc3c9e36 Removed some compilation warnings. 2012-05-27 09:56:32 +02:00
psxlover
82fd2f651b NPE in Refinery GUI
https://github.com/SirSengir/BuildCraft/issues/10
2012-05-27 09:56:31 +02:00
Krapht
7e00bd6a7f Add NPE protection 2012-05-27 09:54:45 +02:00
SirSengir
64b9fdd460 Fixed compile error. 2012-05-27 09:45:02 +02:00
psxlover
f445024282 A exception that was already being caught. 2012-05-27 01:56:33 +03:00
psxlover
eb44f8fab1 Fixed filler respawning striped tape after it gets destroyed. 2012-05-27 01:36:01 +03:00
psxlover
e5e1ec40ee Removed some compilation warnings. 2012-05-26 22:44:51 +03:00
psxlover
031035bd7d NPE in Refinery GUI
https://github.com/SirSengir/BuildCraft/issues/10
2012-05-26 20:54:03 +03:00
Krapht
4d3851ca28 Add NPE protection 2012-05-26 17:49:26 +02:00
SirSengir
9d30299a91 Fixed tile assembly table on SMP. 2012-05-26 15:40:32 +02:00
SirSengir
1162025f98 Merge branch 'master' into TransportSecure
Conflicts:
	common/net/minecraft/src/buildcraft/transport/PipeTransportItems.java
2012-05-26 15:32:12 +02:00
SirSengir
fac800c8d2 Fixed tile assembly table on SMP. 2012-05-26 15:25:42 +02:00
Krapht
1ab3c3e2d5 Added recipe for the Hopper 2012-05-26 02:14:36 +02:00
SirSengir
3c17b73551 Merge pull request #6 from psxlover/Fixes
SendToPlayers only on specified world instead of all worlds.
2012-05-20 07:33:16 -07:00
SirSengir
a6c357cb23 Added secure wooden pipe. 2012-05-20 16:27:53 +02:00
SirSengir
e3ce7e9063 Merge branch 'master' into TransportSecure 2012-05-20 15:52:56 +02:00
psxlover
6ea0d5979a Fixed weird bug where sendtoplayers would send to the players on all worlds instead of only the one where the block calling sendtoplayer is. 2012-05-20 14:34:23 +03:00
SirSengir
d4681e4cef Localization support, de_DE localization. 2012-05-19 11:42:36 +02:00
SirSengir
bc1fd20417 Reordered transport inheritance to fix steel pipes. 2012-05-15 20:10:34 +02:00
SirSengir
47a4c58052 More secure logic. 2012-05-14 20:12:24 +02:00
SirSengir
2d1e11fc81 Initial iteration of steel pipe. 2012-05-14 19:07:16 +02:00
SirSengir
73e04b24b1 Pipes track the player that placed them now. 2012-05-14 18:21:23 +02:00
Kyprus
169a8a4805 Fixed the quarry arm in SMP. 2012-05-12 15:25:46 -04:00
SirSengir
ce61cb65dc close[t:1] Stripping a gate will reset triggers on pipe. 2012-05-11 17:09:12 +02:00
SirSengir
82607ee9d2 Initial commit to github. 2012-05-09 22:43:05 +02:00