Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2093 commits 1 branch 0 tags 19 MiB
Commit graph

1610 commits

Author SHA1 Message Date
CovertJaguar
f593cf7a20 Version 4.1.1 2013-10-23 21:57:26 -07:00
CovertJaguar
12552b3b04 Increase Gate respond time 2013-10-23 13:30:15 -07:00
CovertJaguar
c16a0266e8 Allow Facades and Plugs to be placed over Gates 2013-10-23 13:21:24 -07:00
CovertJaguar
8166cb0bd8 Fix slot click issue with Phantom Slots 2013-10-22 21:44:43 -07:00
CovertJaguar
ce2efe13bb Remove some dead code 2013-10-20 11:50:40 -07:00
CovertJaguar
aa67b6dd5a More Facade Rendering tweaks 
No, this does not fix #1287, sorry.
 2013-10-20 11:49:38 -07:00
CovertJaguar
93f9dceb90 Improve Facade Rendering + Interaction 2013-10-20 00:37:04 -07:00
CovertJaguar
d6e0277b7d Wood Item Pipes shouldn't never explode themselves 2013-10-20 00:37:03 -07:00
CovertJaguar
4d845eb5c5 Merge branch 'master' of https://github.com/BuildCraft/BuildCraft 2013-10-19 04:23:26 -07:00
CovertJaguar
29e5657b0a Fix pumplist case confusion 2013-10-19 04:22:50 -07:00
CovertJaguar
1e224ba4ef Add some commented out debug statements to PowerHandlers 2013-10-15 16:40:09 -07:00
CovertJaguar
4a9eb69b91 Attempt to make pickBlock supports Gate/Plugs 
Whether a Gate is an Autoarchic Gate or not is not sync to the client unfortunately.
 2013-10-15 16:38:30 -07:00
CovertJaguar
6fdbd8c525 Move Facades to own tab 2013-10-15 16:37:17 -07:00
CovertJaguar
e4cad84af6 Fix Gate removal 2013-10-15 14:33:11 -07:00
CovertJaguar
8e92d0494c Fuel/Oil should explode when placed in the nether 2013-10-15 10:41:04 -07:00
CovertJaguar
3438566406 Fix marker rendering 2013-10-15 10:09:23 -07:00
CovertJaguar
8b2093b7ea Fix painted Item rendering 2013-10-15 09:53:20 -07:00
CovertJaguar
068066d9bd Allows bouncing on Diazuli Pipe 2013-10-15 09:15:28 -07:00
CovertJaguar
4ee2d8bd07 Remove depreciated addCreativeItems() function 2013-10-14 12:33:26 -07:00
CovertJaguar
e4af7d00f6 Cleanup last commit 2013-10-13 08:22:31 -07:00
Eragonn1490
bab1e30d6c Added Gears to Ore Dictionary 
Added Imports for OreDictionary
Added all the gears to the OreDictionary
 2013-10-13 00:49:37 -04:00
CovertJaguar
ef2eace03c Add Tank tiles 2013-10-12 17:13:40 -07:00
CovertJaguar
99fca02856 Fix Pipe Raytracing + Improve Pipe interactions 
Closes #1246

Its now much easier and more consistent to remove specific addons from a
pipe. Sneak-click with a gate to remove a gate, sneak-click with a
Yellow Wire to remove a Yellow Wire, etc...

Plugs can now be placed easily and simply on any side of the pipe in any
configuration.

Selection Box now highlights the part of the pipe you are pointing at.
 2013-10-11 19:16:57 -07:00
CovertJaguar
9cb53f9405 Fix NPE in ACT 
Closes #1270
 2013-10-11 06:06:11 -07:00
CovertJaguar
54b2e5de88 Revert "Fixed missing import" 
This reverts commit 62f2ac032c.
 2013-10-11 06:02:57 -07:00
CovertJaguar
eb0f10e098 Merge branch 'master' of https://github.com/BuildCraft/BuildCraft 2013-10-11 06:02:45 -07:00
CovertJaguar
7daea136ea Revert "Fix Forge ore dictionary support for the Assembly Table" 
This reverts commit 11c96949ec.
 2013-10-11 06:02:22 -07:00
Matthew Prenger
62f2ac032c Fixed missing import 2013-10-10 18:48:32 -05:00
CovertJaguar
16a6d768db Revert "Bugfix for non-world liquids" 
This reverts commit 16a577e1eb.
 2013-10-10 03:45:00 -07:00
Reika
16a577e1eb Bugfix for non-world liquids 2013-10-10 00:37:31 -04:00
viliml
11c96949ec Fix Forge ore dictionary support for the Assembly Table 
Fixes https://github.com/BuildCraft/BuildCraft/issues/531 .
Don't worry, I checked it and it has no errors and works as intended :D
 2013-10-09 19:19:39 +02:00
CovertJaguar
3a39b289a2 Moved Pipe Gate/Wire rendering to the TESR 
Should greatly improve performance of wire/gate switching.
 2013-10-08 11:13:40 -07:00
CovertJaguar
fb0ee91183 Fix issues with Wooden Engine 
Closes #1253
 2013-10-08 11:02:14 -07:00
CovertJaguar
0a004e4383 Add configs for fuel values 2013-10-07 09:14:51 -07:00
Player
2a38a58fbb energy: nerf oil and fuel from 60k/600k to 15k/150k MJ/bucket. The power (3/6 MJ/t) is unchanged. 
This change reduces the mismatch between the liquid and solid fuel energy value.
 2013-10-07 17:01:50 +02:00
CovertJaguar
6eb39da66f Prevent Spring block updates on chunk gen 2013-10-06 15:26:35 -07:00
CovertJaguar
7bbb853aae Expand PowerHandler Javadocs some more 2013-10-05 07:46:47 -07:00
CovertJaguar
782002b458 Fix some texture fighting on Kinesis Pipes 2013-10-05 07:24:54 -07:00
CovertJaguar
f76c684162 Closes #1250 
Don't know how it happened, but whatever.
 2013-10-05 06:19:54 -07:00
CovertJaguar
de8da4c008 Some minor cleanup 2013-10-05 06:18:01 -07:00
CovertJaguar
b6cb556274 Fix version check 2013-09-27 22:13:26 -07:00
CovertJaguar
1a639f7afb Remove some unneeded imports 2013-09-27 22:13:25 -07:00
Christian
f35ea290e5 Fix single pulse : account for the baked in energy loss.. 2013-09-26 00:01:12 -04:00
CovertJaguar
68b5c5267d Added Iron Kinesis Pipe 
The Iron Kinesis Pipe allows you select its throughput limiter via
Wrench or Gate Action.

The possible values are: 2, 4, 8, 16, 32 , 64, and 128 MJ/t
 2013-09-25 18:16:59 -07:00
CovertJaguar
e3fab2896d Merge branch 'master' of https://github.com/BuildCraft/BuildCraft 2013-09-25 17:49:06 -07:00
CovertJaguar
daf79abda5 Fix for Pumps 
Closes #1224
 2013-09-25 17:48:39 -07:00
Captain Shadows
8782d5125a Ore Dictionary compatibility 
Changed some recipes to use the Ore Dictionary. Made shapeless
recipes use the Ore Dictionary. Also implemented the changes that CJ
asked for.

If there was another PR like this one(Not counting #1227, #1232, and
#1234), I would like to know why not?
 2013-09-25 16:07:49 -04:00
CovertJaguar
22548ad2b1 Merge pull request #1225 from Zjarek/master 
Fix for kinesis pipes content triggers
 2013-09-24 10:17:45 -07:00
CovertJaguar
3c84c34bd9 Wooden Pipes shouldn't orient to pipes 
Closes #1218
 2013-09-24 10:17:21 -07:00
CovertJaguar
93290e0ad9 Merge pull request #1228 from sadris/oilgenfreq 
Added oil well generation probability scalar to config file
 2013-09-24 10:11:51 -07:00
CovertJaguar
6c76a9a8d6 Add flat taxing to PowerHandler for King Lemming 
This should be a non-breaking API change.
 2013-09-24 08:50:18 -07:00
Sergey Shatunov
83298c9b94
Add a config property for update check 2013-09-23 22:21:24 +08:00
Gordon H
4a017f355e Added oil well generation probability scalar to config file 2013-09-22 09:48:25 -04:00
Jaroslaw Szczesniewski
5f4d4c1008 Fix for kinesis pipes content triggers 
Due to smoothing s>0 will always be true. All float values higher than 0
will work, however the lower the value, the longer the delay. Tested
with 1 stirling engine powering 16 pumps, s>0.001 caused flickering in
this case.
 2013-09-22 01:24:51 +02:00
Flow86
b7f173b7f2 place button in emerald pipe a bit better (ideas for better placement are welcome) 2013-09-19 12:51:40 +02:00
Flow86
74d2239dc7 added non blocking mode to emerald pipe 
implements/closes #1195
 2013-09-19 12:46:06 +02:00
Flow86
14db1ed0eb fix GuiMultiButton Tooltip handling 2013-09-19 12:46:06 +02:00
Christian
bb7aa41b48 Fix Quarry in the nether. Closes a bunch of bug reports no doubt. 2013-09-18 09:56:55 -04:00
Flow86
5b4d661543 Update Pipe.java 
fix NPE.

(see RS485/LogisticsPipes-Dev#182)
 2013-09-17 08:49:06 +02:00
CovertJaguar
cde67912f6 Fix loop in TileEngine 2013-09-15 23:18:36 -07:00
CovertJaguar
1aaa35c5b1 Increase hardness of blocks 2013-09-15 23:18:14 -07:00
ganymedes01
08c4bc3f47 Fix for sandstone pipes 2013-09-15 21:40:27 +01:00
CovertJaguar
2d65129722 More tweaks to improve mobility of blocks 2013-09-15 00:38:55 -07:00
CovertJaguar
56d46de1be Wooden Power Pipes can no longer output power 
Prevents power loops when a machine both emits and accepts power.

Closes #1202
 2013-09-13 20:47:16 -07:00
CovertJaguar
74fd409330 Added Mining Config Options 
Config options added:
* Mining Cost Multiplier, scales power usage of both Quarry and Mining
Well
* Max Depth, limited Quarry/Well to a certain depth below the block
* One Time Use Quarries, Quarry doesn't drop an item when broken, get it
right the first time (defaults to false)
 2013-09-12 11:03:50 -07:00
CovertJaguar
880fd64e27 Engines should prefer facing pipes on placement 2013-09-12 11:03:32 -07:00
ddoggy99
5e786d8902 Cleaned up IMC code 2013-09-12 23:27:11 +10:00
CovertJaguar
87bb24e263 Fix possible NPE in TankManager 2013-09-08 06:51:21 -07:00
CovertJaguar
1253534535 Add tooltips to all the Pipes 2013-09-06 15:49:52 -07:00
Christian
730a0ac4a7 Fix for updated MCP names 2013-09-03 18:13:32 -04:00
CovertJaguar
158c79c301 Clean up Obsidian Pipe code 2013-09-03 02:12:13 -07:00
CovertJaguar
ae77912afd Make Tanks emit light if the Fluid glows 2013-09-03 02:11:14 -07:00
CovertJaguar
ddc203fe59 Possible fix for #1182 2013-09-01 04:51:50 -07:00
CovertJaguar
57c58036b7 Working out the kinks 2013-08-31 18:31:15 -07:00
Krapht
c6ca3b28e7 Move implementation of IInventory from TileEngine to new abstract class TileEngineWithInventory. 
This will effectivly remove IInventory from redstone engines.
Fixes #1180
 2013-08-31 22:17:50 +02:00
Krapht
f6b0f8a1f2 Added a BuildCraftCore config option for color-blind mode. 
Added alternate textures for Diamond pipe interface and the green side of diamond
 2013-08-31 19:01:31 +02:00
CovertJaguar
f02295bac4 Flood Gate shouldn't put water in the Nether 2013-08-29 10:38:08 -07:00
CovertJaguar
f2f1828386 Limit Coolant per tick rather Cooling per tick 
Makes better Coolants more desirable because they can cool faster.
 2013-08-29 07:27:56 -07:00
CovertJaguar
48daafae35 Reworked Iron Engine Heat Mechanics 
They cool down much faster, but use Coolant while doing so.
Additionally, they are affected by Biome temperature. Expect to need
more water/better Coolant in a desert for optimal operation. Ice Blocks
are also recommended.
 2013-08-29 07:07:11 -07:00
CovertJaguar
45e73c28b1 Fix Laser's hasWork trigger 2013-08-29 04:51:28 -07:00
CovertJaguar
54e7e372ec Make pipes with solid end consistant 2013-08-28 19:37:56 -07:00
CovertJaguar
cfd89df7b9 Make Plugs more visible in hand 2013-08-28 19:36:59 -07:00
CovertJaguar
4609d74a8e Fix Refinery Filters 2013-08-25 12:59:59 -07:00
CovertJaguar
c625b5484c Add Chests to rotations requiring sneaking 2013-08-24 17:26:49 -07:00
CovertJaguar
23ed609a53 Limit Buildcraft to current MC ver 2013-08-23 16:29:46 -07:00
Krapht
67772a9c59 Fix kinisis pipes when doDaylightCycle is set to false. Fixes #1152 2013-08-23 22:03:25 +02:00
Krapht
fac6e9236e Replace getWorldTime() with getTotalWorldTime 2013-08-23 21:57:34 +02:00
Krapht
4ae2380d57 Probably fixes #991 2013-08-23 21:55:19 +02:00
Krapht
4f21d4f8d8 Fix chute either working twice as fast or not at all depending on when you set doDaylightCycle to false 2013-08-23 21:46:51 +02:00
Krapht
8d1c6dc936 Fix engine not working if doDaylightCycle is set to false. Fixes #1148 2013-08-23 21:41:41 +02:00
ganymedes01
0b91ef1467 Import ISidedInventort... 
Sorry about that... Massive derp
 2013-08-23 15:45:49 +01:00
ganymedes01
f88155ef0e Better handling for ISidedInventory tile entities 
The pipe shouldn't connect to an inventory that isn't available from a certain side. With this it would be easier to manage what sides the pipe connects to without having to implement IPipeConnection. And also get rid of unnecessary connections.
 2013-08-23 13:43:18 +01:00
CovertJaguar
c7b00eb4e5 Null check properly 2013-08-23 03:06:26 -07:00
CovertJaguar
4ab4ec3b67 Merge pull request #1150 from Mrkol/master 
Fix Z-fighting.
 2013-08-22 21:20:38 -07:00
Roman Sandu
4172ba2ebc Got rid of Z-fighting of hollow facades with pipes inside them. 2013-08-22 18:05:12 +04:00
CovertJaguar
88cee14948 Halve Laser Power Perdition 2013-08-21 15:08:02 -07:00
CovertJaguar
4a21711ee7 Make Refinery render safer 
Closes #1139
 2013-08-19 00:54:04 -07:00
CovertJaguar
5f0f47c327 Wrench can rotate buttons/levers only on sneak 2013-08-17 21:47:19 -07:00
CovertJaguar
bc08a47090 Don't rotate buttons either! 2013-08-17 00:26:07 -07:00
CovertJaguar
7071314d37 Various usability tweaks to the refinery 
Filters are now set automatically by the first fluid to be inserted. You
can reset them with a wrench Shift-Right Click.
 2013-08-16 23:42:49 -07:00
CovertJaguar
2f5a61217f Pipes shouldn't reorient if neighbor unloaded 2013-08-16 15:52:45 -07:00
CovertJaguar
acd3eb1af4 Wrenches shouldn't rotate Levers 2013-08-16 15:30:38 -07:00
CovertJaguar
613af8c155 Ok, so client pipes do need to tick some stuff 
Closes #1128
 2013-08-16 02:38:38 -07:00
CovertJaguar
8d7b50fa22 More intelligent pipe side rendering 2013-08-16 02:27:51 -07:00
CovertJaguar
8a12218085 Set fluid flowing icons properly 2013-08-16 02:27:50 -07:00
enkunkun
9889a44f0a Assembly Table has not been localized 2013-08-16 05:32:40 +09:00
CovertJaguar
484f6b9fcd Double Iron Engine cooldown speed 2013-08-14 23:34:33 -07:00
CovertJaguar
d61b2960a3 Minor Power API tweak 
This should allow tickless systems to function properly.

And for the record, this whole "tickless" requirement is more CPU costly
than a simple update tick would be. *shakes fist at Aiden*
 2013-08-14 23:34:14 -07:00
CovertJaguar
fa7faceab5 Fix pipe selection box sync 
Closes #1104

Also, pipes were running server code on the client. This is bad, fixed.

And killed the dead PipeRenderStatePacket.
 2013-08-14 22:58:47 -07:00
CovertJaguar
4d03135b85 Add Floodgate Recipe 
Oops

Closes #1122
 2013-08-14 20:52:17 -07:00
CovertJaguar
399e3d0ce9 Clean code while debug Diamond Pipe 
Conclusion, any issues that people have with Diamond Pipes and AE
machines, are likely AE's fault. Cannot duplicate.

Closes #1005
 2013-08-14 20:52:17 -07:00
CovertJaguar
e705cec237 Merge pull request #1112 from ItsMeElConquistador/master 
Fix pipe rendering (issue #1111)
 2013-08-14 14:26:08 -07:00
CovertJaguar
7522478dd3 Merge pull request #1118 from SandGrainOne/master 
isActive method can give NullPointerException
 2013-08-14 02:23:50 -07:00
Flow86
60cb434da3 fixes #1120 again 
<CovertJaguar> though personally it would be better to make the hook return the value to adjust it by
 2013-08-14 10:31:45 +02:00
Flow86
91b2550956 Update PipeTransportPower.java 
fixes #1120
 2013-08-14 10:20:12 +02:00
SandGrainOne
a70cabb598 isActive method could give NullPointerException 
A pump with an empty "block list" would cause NullPointerException if
isActive was called.
 2013-08-13 20:22:55 +02:00
ElConquistador
a36f245e70 Fix pipe rendering (issue #1111) 2013-08-11 20:19:50 +02:00
CovertJaguar
95cbf27ba7 Merge branch 'master' of https://github.com/BuildCraft/BuildCraft 2013-08-09 01:41:42 -07:00
CovertJaguar
ae59a6cc88 Change how pump handles water. 
Added config "consumeWater" which defaults to false. If false, pumps will not remove water source blocks if it detects more than 9 blocks of water in the area.

This should significantly reduce chunk rerenders and search cost (search terminates after 9 blocks). Essentially making a water pump nearly as computer friendly as an Aqueous Accumulator.
 2013-08-09 01:36:01 -07:00
CovertJaguar
0ae4035dab Reduce redundant code in pipe world renderer 2013-08-09 01:30:03 -07:00
CovertJaguar
c1e6c5d498 Fix AWB dupe 
And make it less likely to happen again in the future.

Also cleaned up some fluid stuff.
 2013-08-08 17:30:30 -07:00
CovertJaguar
2023ccb79a SST Tracker should use total time 
Closed #1107
 2013-08-08 17:26:28 -07:00
CovertJaguar
81b2c7043a Merge mc16 into master 2013-08-07 14:54:17 -07:00
CovertJaguar
a53a724b41 Revert STT changes 
They were broken if you have more than one world.
 2013-08-07 14:42:55 -07:00
SirSengir
358b58321a Fix missing default perdition calculator. 2013-08-07 16:05:04 +02:00
CovertJaguar
d6b8fd6f15 Oops that wasn't supposed to make it in 2013-08-07 02:01:46 -07:00
CovertJaguar
9472dea734 Revert "An attempt to improve PowerHandler cpu usage" 
This reverts commit e85d99b047.
 2013-08-06 22:48:07 -07:00
CovertJaguar
e85d99b047 An attempt to improve PowerHandler cpu usage 2013-08-06 21:50:42 -07:00
CovertJaguar
fc3e3d19cb Some performance improvements related to STT 2013-08-06 21:22:44 -07:00
CovertJaguar
91a84f2062 Changed IPipeConnection to return three states 
And fix engines connecting to pipes. This is why I shouldn't code at 5
AM.
 2013-08-06 14:47:45 -07:00
CovertJaguar
447b914fb5 Rework Pipe connection rules (again) 2013-08-06 04:58:35 -07:00
CovertJaguar
671caa458d Fix Utils.checkPipeConnections() 2013-08-06 03:55:08 -07:00
CovertJaguar
defc41f5d1 More stuff for Soaryn 2013-08-04 17:16:40 -07:00
CovertJaguar
66481d5b62 Fix Soaryn's broken stuff 2013-08-04 16:02:53 -07:00
CovertJaguar
ee1a89f1c3 Add NPE check 
Fixes #1090
 2013-08-04 16:02:31 -07:00
CovertJaguar
15acae3c54 Merge pull request #1093 from viliml/patch-3 
Update BuildCraftEnergy.java
 2013-08-04 15:45:06 -07:00
viliml
321d8d1f2b Update BuildCraftEnergy.java 
Fixes https://github.com/BuildCraft/BuildCraft/issues/1091.
 2013-08-04 22:23:23 +02:00
Emil Lauridsen
3b90e2ed35 Add missing imports 2013-08-04 16:33:38 +02:00
Soaryn
c62c33c11e Fixed spacing 2013-08-03 22:42:06 -04:00
Soaryn
fff440836b Adds Missed call for color 2013-08-03 22:22:24 -04:00
Soaryn
1dd3c3a58f Adds Missed call for color 2013-08-03 22:11:41 -04:00
Soaryn
89980dceb2 Adds FluidStack color to pipes Render 2013-08-03 22:02:40 -04:00
Soaryn
cb8a139f01 Adds FluidStack color to tank Render 2013-08-03 21:43:15 -04:00
Soaryn
fee9c44fe7 Adds FluidStack color to refinery Render 2013-08-03 21:42:29 -04:00
Soaryn
333e38d5b2 Adds color to Refinery Fluids 
Note, this needs a FluidStack to be complete. This only covers basic Fluid Colors
 2013-08-03 21:40:57 -04:00
Soaryn
95fa107860 Adds colorFluid Helper to FluidRenderer 2013-08-03 21:38:57 -04:00
CovertJaguar
b0f72a94ab Add container null check 2013-08-01 00:13:52 -07:00
CovertJaguar
67a9f6389e Forgot some bits 2013-08-01 00:00:23 -07:00
CovertJaguar
f3602d2205 Let Items decide if they like an Inventory 2013-07-31 23:57:09 -07:00
CovertJaguar
5b45375870 Typo boo! 2013-07-31 23:23:31 -07:00
CovertJaguar
3985e58970 endReached should control further processing 2013-07-31 23:22:01 -07:00
CovertJaguar
617d06c3b0 Flood Gate now shuts off on redstone signal 2013-07-31 15:42:00 -07:00
CovertJaguar
ddd2c0f3a1 Fix pump output 2013-07-31 15:41:35 -07:00
CovertJaguar
4c056e989c Power spikes mess with Request triggers 2013-07-31 14:28:22 -07:00
CovertJaguar
10d9d2bb10 Fix some minor isAir checks that were missed 2013-07-31 14:10:53 -07:00
CovertJaguar
a2d30930de Fix Iron Fluid Pipe rotation 2013-07-31 03:23:17 -07:00
SirSengir
658718e3ac Remove SideOnly in PacketPayload 
SideOnly should only ever be a last resort.
 2013-07-31 11:58:39 +02:00
CovertJaguar
d120512934 Some minor Pipe content render improvements 2013-07-31 01:56:53 -07:00
CovertJaguar
cf87c4229d Added disconnects to the version check 2013-07-29 20:35:42 -07:00
CovertJaguar
422f9855a4 Make Wrench full 3D 2013-07-29 12:19:16 -07:00
CovertJaguar
2d50a239cc Revert "Little tweak to make 3rd person held wrench item look better" 
This reverts commit 73fa5865c7.
 2013-07-29 12:17:07 -07:00
tommy1019
de39b79ea0 Added "smart" refinery gui 
Shift-left clicking clears the filter
Right clicking sets the filter to the current fluid in the corresponding tank
 2013-07-28 20:21:47 -05:00
tommy1019
31d1e522e8 Fixed Texture fighting issues with Gates/Plugs 2013-07-28 17:56:11 -05:00
CovertJaguar
0a81c8fca7 Fixed Refinery GUI. Thanks Tommy! 
Closes #1066
Closes #1062
 2013-07-28 15:34:39 -07:00
oitsjustjose
73fa5865c7 Little tweak to make 3rd person held wrench item look better 
Just threw in isFull3D so that way the wrench is held outward instead of sideways. Looks significantly better
 2013-07-28 09:15:33 -05:00
CovertJaguar
ab64958955 Change TravItem position to primitives 2013-07-28 00:46:33 -07:00
CovertJaguar
fd3555a56a Fix injectItems 
Closes #1064
 2013-07-27 23:00:04 -07:00
CovertJaguar
87624d9572 Merge branch 'mc16' of https://github.com/BuildCraft/BuildCraft into mc16 2013-07-27 19:24:32 -07:00
CovertJaguar
a3565c71c6 Fix legacy Gate code on the Pipe 
Why does NO ONE ever test builds on old worlds? Compatibility between MC
versions is a huge priority!
 2013-07-27 19:23:50 -07:00
tommy1019
479ebc2f3f Obsidian pipes can't pick up arrows players can't. 2013-07-27 18:39:26 -05:00
CovertJaguar
54677904f0 Don't try to place Fluids with no block 2013-07-27 16:09:11 -07:00
CovertJaguar
5e7d6905e7 Fix typo 2013-07-27 13:52:28 -07:00
CovertJaguar
46d73fbc50 Fix AIOOB in RenderPipe 
Closes #1059
 2013-07-27 13:39:39 -07:00
CovertJaguar
d62148bb07 Merged EntityData and EntityPassiveItem 
They have been replaced by TravelingItem. Which means yes, I broke the
various pipe hooks again.

Additionally IPipedItem and IEntityPassiveItemContribution have been
deleted. Contributions were replaced by a simple NBTCompoundTag field in
TravelingItem (which is essentially all that contributions were anyway).
 2013-07-27 05:59:57 -07:00
CovertJaguar
d9636a7455 Fix shift-left clicking Lapis pipes 
Unfortunately I need to fix a Forge bug to make them swing properly.
 2013-07-27 00:07:33 -07:00
tommy1019
339675aee8 Shift-right click on lapis pipe scrolls backwards. 2013-07-26 23:44:03 -05:00
CovertJaguar
71bd0a92fd Merge pull request #1055 from viliml/patch-2 
Temporary solution to fluids eating other fluids
 2013-07-26 20:51:25 -07:00
FyberOptic
bffa773344 Assembly Table isInvalid() Crash Fix 
Solution for #1054.  Avoids crash from name conflict with .isInvalid()
between ILaserTarget interface and TileEntity class, in relation to
TileAssemblyTable and TileAdvancedCraftingTable.
 2013-07-26 13:02:12 -04:00
viliml
c057307f33 Temporary solution to fluids eating other fluids 
This will work for BC, untill the Forge devs decide what would be the best universal approach. For now this is a solution to prevent the issue for Oil and Fuel, using the rule "first fluid wins".
 2013-07-26 14:20:05 +02:00
CovertJaguar
9fcf4044e0 Added direction triggers to Iron and Daizuli Pipes 
Someone made these nice icons and never used them!
 2013-07-24 17:59:13 -07:00
CovertJaguar
50d9a1814a Added Daizuli Pipe 
The Daizuli Pipe is similar to a Iron Pipe, except it only routes
matching colored itemstacks that have been painted by a Lapis Pipe.

The color can be set via Gate Action or via shift-click with a Wrench.
 2013-07-24 14:39:07 -07:00
CovertJaguar
1745d270d8 Internalized IPipedItem 
May delete eventually depending on feedback.
 2013-07-24 13:14:32 -07:00
CovertJaguar
fe1af19227 Clean up and consolidate Pipe API interfaces 
Note: injectItem() takes the opposite side that entityEntering() used
to.
 2013-07-24 13:07:09 -07:00
CovertJaguar
f457df7ced Add Flood Gate Texture 
Provided by laz2727, many thanks!
 2013-07-24 05:16:50 -07:00
CovertJaguar
2bd4e6ef84 Fix pipe renderer using wrong texture for center 2013-07-24 05:12:13 -07:00
CovertJaguar
1f5ee1225e Desync Pump/FloodGate from world tick 
Having all the pumps/floodgates rebuild their queues on the same tick is
probably a bad idea.
 2013-07-24 01:41:10 -07:00
CovertJaguar
47cc3032c5 Swap out FML events 2013-07-24 01:23:23 -07:00
CovertJaguar
28c3b15c58 Use Generics to reduce annoying casts in Pipe 2013-07-24 01:17:55 -07:00
CovertJaguar
1f80338819 Fix Fluid Sandstone Pipe 
Closes #1026
 2013-07-24 01:02:07 -07:00
CovertJaguar
9150c673a5 Tweak Pump 2013-07-24 00:30:31 -07:00
CovertJaguar
3f21c33427 Fix Painted Item rendering with some items 2013-07-24 00:30:13 -07:00
CovertJaguar
05c9cb18f0 Some more Flood Gate tweaks 2013-07-24 00:12:12 -07:00
CovertJaguar
e66ed0d900 Add Lapis Pipe Actions 
Icons provided by tommy__123__, many thanks!
 2013-07-23 23:27:36 -07:00
CovertJaguar
83431cebf0 Added Lapis Item Pipe 
This pipe paints passing items pretty colors.

TODO:
Add support to Diamond Pipe for painted items.
Add actions to set the Pipe color.

NOTES:
This required way more changes to the Pipe code that it should have.
 2013-07-23 21:48:51 -07:00
CovertJaguar
f43e12e9b2 Fix render state from sending too many bytes 2013-07-23 17:37:42 -07:00
CovertJaguar
35501234d8 Restore pump throttle, oops. 2013-07-22 22:53:15 -07:00
CovertJaguar
337a94848f Added Flood Gate + Pump tweaks 
The Flood Gate still needs a texture, but functionally it all there.

All you have to do is pump in a fluid and it will place it in the world.
 2013-07-22 22:50:53 -07:00
CovertJaguar
a8f43acfbd Don't render tank sides where stacked 2013-07-22 22:50:52 -07:00
CovertJaguar
e581841eaa Fix Pipe connections with Iron Engine 2013-07-22 22:50:52 -07:00
CovertJaguar
07372587cf Fix Tank net sync 2013-07-22 22:50:51 -07:00
CovertJaguar
6e1788fb0c Add block disables to BCFactory 
Now if you set the blockId to 0 or -1 in the config, the block will not
be loaded.
 2013-07-22 22:50:50 -07:00
CovertJaguar
fe9dc15423 Bump forge dependancy 2013-07-22 16:45:41 -07:00
CovertJaguar
a14ac77ec3 Add new Fluid blocks to softBlocks 2013-07-22 16:41:58 -07:00
CovertJaguar
8995ff79bf Clean up some Gate code 2013-07-22 14:14:36 -07:00
viliml
440b342165 Update Pipe.java 
Fixes https://github.com/BuildCraft/BuildCraft/issues/1035 .
resetGate() set's the gate to null which causes a NPE.
 2013-07-22 21:00:37 +02:00
viliml
32adf8a309 Convert strings to chat messages 
Fixes https://github.com/BuildCraft/BuildCraft/issues/1027
 2013-07-21 14:39:56 +02:00
CovertJaguar
502af8f9ae Add sanity check to hasPlug() 2013-07-20 22:52:42 -07:00
CovertJaguar
937fb12900 And Jack'O'Lanterns too 2013-07-20 19:36:35 -07:00
CovertJaguar
488a83f9e4 Ban Redstone Lamps from Facades 2013-07-20 19:35:14 -07:00
CovertJaguar
4d8799019e Simplify trigger registration 2013-07-20 18:45:58 -07:00
CovertJaguar
66bc9914ae Fix Gate GUI 2013-07-20 18:06:17 -07:00
CovertJaguar
e0e66f7910 Fix formatting of PipeTransportFluid 2013-07-20 17:28:54 -07:00
CovertJaguar
897eee58dc Finished Trigger updates 2013-07-20 17:25:41 -07:00
CovertJaguar
a19470092e Trigger busy work 
Adapted old Icon framework to new API, reducing amount of busy work
tremendously.

Mostly what remains is providing unique tags for the triggers.
 2013-07-20 16:25:32 -07:00
CovertJaguar
311078d660 Limited Gate/Trigger rewrite 
Moved most of the Gate logic out of Pipe and into Gate. Expect some NPEs
on pipe.gate.

Converted the Trigger/Action API to key off of unique Strings instead of
IDs. Legacy conversion code implemented as well so it shouldn't affect
worlds.

Simplified Trigger/Action Icon functions. No more indexes.

More busy work is needed to convert the existing Triggers to the new
code.
 2013-07-20 15:58:55 -07:00
CovertJaguar
b320c1f371 Fix pipe rotation code 
Closes #1022
 2013-07-19 15:58:21 -07:00
CovertJaguar
4fd129170c Mark drips client only 
Might fix server issues *shrugs*
 2013-07-19 15:22:26 -07:00
CovertJaguar
2302eacad4 Merge pull request #1017 from viliml/patch-3 
Fix combustion engine GUI not rendering fluids properly
 2013-07-19 07:47:52 -07:00
CovertJaguar
9c35934e46 Merge pull request #1020 from viliml/patch-5 
Squashed the last texture bugs
 2013-07-19 07:47:39 -07:00
CovertJaguar
776147fe92 Merge pull request #1018 from viliml/patch-4 
Add missing case for EQUIPPED_FIRST_PERSON
 2013-07-19 07:47:02 -07:00
CovertJaguar
0ce916dcd8 Improve Pump search Algo 
Mainly just cleaned up the code and replaced the TreeSets with Deques.

Also made it so the pump will only keep the pumping the same type of
liquid it started on.  If you wish to reset it to pump any liquid hit
with a wrench and the next liquid it pumps will be the new filter.
 2013-07-19 07:09:18 -07:00
viliml
4db502dbf6 Update RenderingEntityBlocks.java 2013-07-19 15:20:09 +02:00
viliml
5b37c2e505 Update GuiFiller.java 2013-07-19 15:10:56 +02:00
viliml
cbc6e70969 Fix engine GUI not drawing the lendger "energy" icon properly 
I'm starting to see a pattern here...
 2013-07-19 15:03:49 +02:00
viliml
1b84d0c592 Add missing case for EQUIPPED_FIRST_PERSON 
It needs to be on the 1.6 branch too!
 2013-07-19 14:08:10 +02:00
viliml
a75604d371 Fix combustion engine GUI not rendering fluids properly 
Same thing as the tank, block textures aren't in terrain.png any more!
 2013-07-19 14:04:13 +02:00
CovertJaguar
108adc1a03 Fix possible exception 2013-07-18 22:19:43 -07:00
CovertJaguar
39855eed65 Add Fluid drip particles 2013-07-18 22:19:23 -07:00
CovertJaguar
bf46a1a6af Merge pull request #1013 from viliml/patch-2 
Fix tank not rendering fluids properly.
 2013-07-18 14:24:11 -07:00
CovertJaguar
5357467349 Merge pull request #1012 from viliml/patch-1 
Fix typo.
 2013-07-18 14:23:49 -07:00
CovertJaguar
16c261c478 Merge pull request #1014 from tomason/npe-combustion 
fix NPE when using combustion engine with empty tank
 2013-07-18 14:23:11 -07:00
tomason
ec5f7edf7f fix array indexes 2013-07-18 19:29:24 +02:00
tomason
db1ff2e5c7 Lava is now lava 2013-07-18 19:23:24 +02:00
viliml
d61aacde16 Fix tank not rendering fluids properly. 
Before every fluid in the tank was pink(no texture) because the texture path has changed in 1.6.
 2013-07-18 15:44:14 +02:00
viliml
d9a06ceba0 Fix typo. 
In case another mod adds a fuel fluid, and it's loaded before BC, without this fix the fuel buckets would place oil blocks.
 2013-07-18 15:26:16 +02:00
tomason
fa577e2c1b fix NPE when using combustion engine with empty tank 2013-07-18 11:56:08 +02:00
CovertJaguar
e3e9404b8a GuiRefinery code cleanup 2013-07-17 16:25:25 -07:00
CovertJaguar
9cb75de1df PipeLogic Smash 2013-07-17 16:24:57 -07:00
CovertJaguar
1860ebc300 Rewrite Iron/Wood logic into helper classes 2013-07-17 16:12:01 -07:00
CovertJaguar
4dbd28a0dc Wooden Power pipe needs no logic 2013-07-17 15:16:21 -07:00
CovertJaguar
f5c601b570 Fix net code 2013-07-17 13:43:44 -07:00
CovertJaguar
21920e1556 Fix liquid textures 2013-07-17 13:43:34 -07:00
CovertJaguar
13534ddae6 Some clean-up of the refinery code 2013-07-17 11:55:54 -07:00
CovertJaguar
e49bddc867 Fix issues with PR #1011 
See https://github.com/BuildCraft/BuildCraft/issues/1011
 2013-07-17 11:51:16 -07:00
CovertJaguar
a4765c766e Merge pull request #943 from dmillerw/master 
Fixed pipes rendering in hand as flat texture
 2013-07-17 11:21:32 -07:00
samoht-2401
9e6e198794 Get things running / New 1.6 ressource directory 
Modified some little things in order to be able to compile.
The new ressource organization is added too.
 2013-07-17 18:54:04 +02:00
Flow86
23ad66a3ed Merge pull request #1009 from samoht-2401/mc16 
Better rendering
 2013-07-17 05:43:37 -07:00
samoht-2401
088f862574 Better rendering 2013-07-17 14:40:30 +02:00
Andrew Hill
05313f8872 Allow for more advanced delivery conditions 
This doesn't control items passing between pipes, only a condition for a
PipedItem to prevent itself exiting the network in specific places.

This modification allows BC to have more advanced sinking conditions
(eg: the discussion about coloured pipes/items)

Logistics pipes currently modifies something via reflection to prevent
it's liquid packets from being sunk to standard IInventories.
 2013-07-17 16:56:03 +10:00
CovertJaguar
8a3d837e94 Remove Proxy.getBuildCraftBase() 
It was only used by the blueprint code, and will be replaced eventually
anyway.
 2013-07-16 14:54:47 -07:00