Commit graph

1549 commits

Author SHA1 Message Date
CovertJaguar
14dc0014c9 Prevent NPE in Coolant API 2013-11-23 23:23:38 -08:00
CovertJaguar
5d5d5a2706 Merge branch 'SandGrainOne-master' 2013-11-23 12:25:57 -08:00
CovertJaguar
25d411ce1a Merge Filler into Master 2013-11-23 12:25:15 -08:00
CovertJaguar
b5fc98ad2c Merge branch 'master' of git://github.com/SandGrainOne/BuildCraft into SandGrainOne-master 2013-11-23 11:49:39 -08:00
Taelnia
71ebc1fb69 Fix for creative mode pick block on gates for re-loaded worlds.
Also fixes Highlight Overlays such as NEI and Waila
2013-11-23 02:21:40 -05:00
CovertJaguar
5971a75e42 Allow Draining of Fuel in Iron Engine 2013-11-22 15:18:43 -08:00
SandGrainOne
ec4ed4df99 Adding Logemerald pipe
This is an action sensitive extraction pipe. The pipe can be configured
with 4 different items and actions will decide which one to extract from
the connected inventory.
2013-11-21 20:57:18 +01:00
CovertJaguar
7ee48c9cbd Fix Fluid Localization 2013-11-20 20:32:11 -08:00
CovertJaguar
b89e5718db Merge branch 'master' into filler 2013-11-20 20:21:54 -08:00
CovertJaguar
e7c5090e1e Pumps can now be disabled with redstone 2013-11-20 20:13:38 -08:00
CovertJaguar
9d4b1b9782 Move ILaserTarget to the power API 2013-11-20 17:27:28 -08:00
DemoXin
9631ef5de6 * BlockUtil.getItemStackFromBlock() now properly posts HarvestDropsEvent and loads its results for compatibility.
* BlockUtil.breakBlock() now utilizes BlockUtil.getItemStackFromBlock() to get its drop list.
2013-11-19 21:02:30 -05:00
CovertJaguar
d870fcb182 Fix Emerald Pipe Button Tooltip
Closes #1322
2013-11-19 06:11:20 -08:00
CovertJaguar
f1bec62b90 Rewrite previous Assembly Table commit
Yeah...there were better ways to do that...
2013-11-19 05:26:30 -08:00
CovertJaguar
0f5a47f31f Fairly Major Filler Rework
Changes:
-The "crafting grid" is gone.
-API completely reworked
-Patterns can be "stateful", this could bring major improvements to the
scanning algorithms if utilized
-You can change the pattern via Gate Actions
-Various peripherally related GUI framework changes
2013-11-19 03:54:37 -08:00
Taelnia
26572907bc Changes to AssemblyRecipe to support OreDict
- Moved AssemblyRecipes to Init phase in BuildCraftTransport so that the

OreDictionary is completed by then
- Added new AssemblyRecipe constructor that can take ore tag strings
paired with a desired stack size
- Changed pipe wires over to new constructor
2013-11-16 20:19:54 -05:00
CovertJaguar
b37f33c104 Merge pull request #1320 from taelnia/IronPipeFacingFix
Prevent Iron Pipes from switching to plugged output
2013-11-16 16:22:58 -08:00
taelnia
372941c32f simplify code for iron pipe facing check 2013-11-16 11:23:37 -05:00
CovertJaguar
05fedb059e Buff Oil Spring output
It should now produce 4x time amount of Oil, resulting in the same
energy output from before the Oil nerf.
2013-11-15 21:20:46 -08:00
taelnia
91e5648903 Prevent Iron Pipes from switching to a plugged side 2013-11-15 22:32:30 -05:00
Taelnia
e825066fd0 Revert "Add Ore Dictionary support for Assembly Recipes"
This reverts commit 3d1815595b.
2013-11-15 22:27:30 -05:00
taelnia
3d1815595b Add Ore Dictionary support for Assembly Recipes 2013-11-15 21:07:15 -05:00
CovertJaguar
696c206792 Register all items with FML so they survive 1.7 2013-11-13 17:23:41 -08:00
Scott M. Barbour
7073a10fc5 CraftingHelper - Properly name the variables 2013-11-13 10:37:24 -06:00
CovertJaguar
1e00cf012b Possible fix for Pipe placement sync issue
Theoretically this should send an update on placement to all watching
players so everyone can see the pipe.
2013-11-05 16:28:21 -08:00
bdew
9a8f9606cf Workaround for scala compiler derp 2013-11-02 11:25:22 +02:00
CovertJaguar
643545b271 Split API into individual sections
Yes, I know this fails.  Don't use it. It needs to be fixed on FML's
side.
2013-10-30 23:16:03 -07:00
Christian
0aad0c785b Add in API markers for all the BC API packages. They come under the umbrella "BuildCraftAPI", expect warnings from now on if you don't include these in your BC dependent mods. 2013-10-30 23:09:35 -04:00
taelnia
17ff442867 Adjusted FluidContainerTrigger to pass through the side being checked 2013-10-30 15:54:31 -04:00
CovertJaguar
7f73cc2691 Clean up Gate GUIs a bit
Size them appropriately and align the slots properly.
2013-10-29 03:08:22 -07:00
CovertJaguar
6969d43d4b Tweak Engines a bit to restore some old behavior 2013-10-28 16:35:00 -07:00
CovertJaguar
206f2fe712 Do it right this time 2013-10-27 08:19:59 -07:00
CovertJaguar
a5de67f4f0 Allow regex version matching in version file 2013-10-27 08:16:03 -07:00
CovertJaguar
bfbd2ef55d Clean plug matrix after rerender
Should fix constant chunk refreshes.
2013-10-27 07:07:55 -07:00
Player
36da365ccb pipes: improve render performance 2013-10-27 12:14:14 +01:00
CovertJaguar
bdf93e12ba Register chipset stacks with FML for good measure 2013-10-26 03:14:23 -07:00
CovertJaguar
9074f10c1d Register chipsets with FML 2013-10-26 03:03:19 -07:00
CovertJaguar
d7739cc8cb Triggers can now require a parameter..
...and will not be show on gates that don't support parameters.

Also moved logger to own class and added a API error function.
2013-10-25 18:11:10 -07:00
CovertJaguar
4bdf0f22d5 Buffer Triggers now apply to all Inventories
Also adjusted inventory triggers to account for whether an item can be
put in a slot when calculating if there is space in the inventory.
2013-10-24 18:31:42 -07:00
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