SpaceToad
c516cc5862
fixed facade display and pipe initialization
2014-02-09 19:03:13 +01:00
SpaceToad
58ed5ee20c
fixed biomes conflicts and forge version
2014-02-09 18:15:15 +01:00
SpaceToad
4dacb568ba
fixed last compilation errors
2014-02-09 18:02:44 +01:00
SpaceToad
6692683e4f
removed obsolete file
2014-02-09 12:30:02 +01:00
SpaceToad
36a9ef91e5
more compilation fixes for 1.7.2
2014-02-09 12:29:21 +01:00
SpaceToad
6b36051353
progress with 1.7.2 port
2014-02-08 20:39:39 +01:00
SpaceToad
20d08f393a
progress with 1.7.2 port
2014-02-08 16:04:03 +01:00
SpaceToad
2bc0a85bbe
made progress with 1.7.2 port
2014-02-08 14:47:31 +01:00
SpaceToad
87562542c9
Merge branch 'marmot' into BuildCraft-5.0.x
2014-02-08 10:39:18 +01:00
SpaceToad
2995c13c1d
Merge branch 'marmot' into builder
2014-02-08 10:38:03 +01:00
SpaceToad
fce098b021
Merge branch 'nightly' into marmot
2014-02-08 10:37:36 +01:00
SpaceToad
ec265fd6f3
implemented robot stations and robot hierarchy
2014-02-08 10:28:16 +01:00
SpaceToad
12cb51373e
various experiments for BC NextGen
2014-02-01 17:19:07 +01:00
SandGrainOne
5055d8c146
Fluid level trigger for tanks
2014-01-30 20:08:01 +01:00
SpaceToad
fef5ccbac1
further progress in supporting fillers for urbanist module
2014-01-25 11:45:26 +01:00
CovertJaguar
7c09c24499
Add NPE check in Iron Engine
...
Closes #1420
2014-01-21 20:24:36 -08:00
SpaceToad
3dd418a27a
progress in tool filler
2014-01-20 21:15:30 +01:00
SpaceToad
8584db25a9
fixed robots for urbanist
2014-01-19 11:02:11 +01:00
SpaceToad
3742dfdec9
removed unused files
2014-01-18 14:53:57 +01:00
SpaceToad
48ec6c9da7
further progress in urbanist implementation
2014-01-18 14:53:09 +01:00
SpaceToad
b4a668e91f
first set of Urbanism experiments
2014-01-16 22:53:16 +01:00
SpaceToad
3b973044ea
migrated part of the sendTo* calls to the new network API
2014-01-14 19:22:10 +01:00
SpaceToad
14003341e3
progress made in MC 1.7 network support
2014-01-13 20:26:16 +01:00
SpaceToad
13213cd59d
fixed IIcon and IIconRegister names
2014-01-12 23:05:36 +01:00
SpaceToad
be872d3692
Starting the port to Minecraft 1.7
...
Initial set of very obvious fixes for Minecraft 1.7 port, with
an early version of Forge.
2014-01-12 19:12:40 +01:00
SpaceToad
db943bff47
Merge branch 'marmot' into builder
2014-01-12 18:23:46 +01:00
SpaceToad
1c2e28f2dd
Merge branch 'nightly' into marmot
2014-01-12 18:23:34 +01:00
SpaceToad
7af855040b
Further progress for the library
...
Blueprint identification has been adjusted a bit in order to make it easier
to have an ordered list. Loading functions are temporary deactivated waiting
for some more insights on the serialization. Server and client databases have
been separated.
2014-01-12 17:57:32 +01:00
SpaceToad
33a77efaf2
Blueprint serialization over the network
...
This patch changes a bit the behavior of the Library. Instead of being an
item browsing blueprints on the server, it's going to retreive blueprints
built on the server for the client, and then allow the client to send back
its blueprints to the server.
This patch is a first milestone, with functional serialization and
deserialization of a blueprint over the newtork, using the Library as interface.
2014-01-11 20:55:24 +01:00
SpaceToad
3cf761226e
Polymorph classes supported in serializer.
...
The serializer now supports cases where the actual object is different from
the object declared, sending once the class name on the stream.
2014-01-11 17:27:53 +01:00
SpaceToad
08d01c0394
Re-introduction of the builder block
...
Added back the builder block to the world, with fixes of initial obvious errors.
TileArchitect is now passing its name through RPCs.
2014-01-11 13:59:30 +01:00
SpaceToad
9dab76fc71
Support for multi-dimentional arrays in serialization.
...
Carrying on with the work on RPC, this patch implements support for multi-
dimension arrays in serialization.
2014-01-11 12:49:10 +01:00
SpaceToad
4e23782911
added nissing deprecated annotation
2014-01-11 10:56:01 +01:00
SpaceToad
4f4818bb35
Merge branch 'marmot' into builder
2014-01-11 10:49:45 +01:00
SpaceToad
c0cbc7f841
Merge branch 'nightly' into marmot
2014-01-11 10:49:34 +01:00
SpaceToad
7e4b66c127
Merge branch 'nightly' of github.com:BuildCraft/BuildCraft into nightly
2014-01-11 10:47:32 +01:00
SpaceToad
36c2d8d8e2
generalized change made for #1410
2014-01-11 10:46:30 +01:00
SpaceToad
3f591439f1
Merge branch 'TurtleQuarryFix' of https://github.com/acmihal/BuildCraft into acmihal-TurtleQuarryFix
2014-01-11 10:37:06 +01:00
acmihal
7e9f75a7bc
Use rotationYaw to set quarry orientation.
...
Allows computercraft turtles to place quarries.
2014-01-10 21:28:08 -08:00
SpaceToad
498676bf0c
updated documentation
2014-01-09 21:15:12 +01:00
SpaceToad
ce215587a8
Further changes in data synchronization.
...
ClassMapping now supports more advanced behavior, in particlar cases where
the destination object do not exist. It has now a much more comprehensive
documentation. TileNetworkData has been renamed NetworkData, as it's used
for more than just tile synchronization. Some additional markers have been
placed on the blueprints to make progress and identify which areas still
need support.
2014-01-09 09:02:23 +01:00
SpaceToad
17ed47d2a2
Improved RPC parameter support - now classes can be serialized through the
...
same system as tiles, and fields selected through @TileEntityNetwork. Improved
the TileLibrary rpc calls to take advantage of this new capability. The RPC
world identification has been fixed as well.
2014-01-08 22:43:25 +01:00
ArkeousAero
09e32da2c7
Added cylinder pattern for the filler.
2014-01-08 04:07:18 -06:00
CovertJaguar
282128d9a6
Close Gate GUI if someone removed the Gate
2014-01-07 16:33:36 -08:00
SpaceToad
1596c5ffc5
This patch is done in the context of TileLibrary synchronization and RPC
...
implementation.
Through the process of implementing RPC, a intrusive simplification in the
network message system has been implemented, completely removing the use
of PayloadArray. On top of that, ClassMapping is now much more flexible,
and doesn't need to be provided with a static size anymore, making it closer
to a suitable class for the needs of RPC message passing.
The result of this simplification is also a slight optimization of message
passing, where certain data needed to be passed over the network (for example
on null objects) which is not needed anymore.
With regards to the TileLibrary itself, the implementation is yet pretty
basic, showcasing the use of RPC to retreive a list of strings computed on
the server.
2014-01-07 22:52:10 +01:00
SpaceToad
ab37498ef1
Merge branch 'marmot' into builder
2014-01-06 20:37:23 +01:00
SpaceToad
78f62ffffb
Merge branch 'nightly' into marmot
2014-01-06 20:24:58 +01:00
SpaceToad
da65d20282
removed unexpected network handler, fix #1405
2014-01-06 20:07:40 +01:00
SpaceToad
d697944364
added missing files for initial RPC implementation
2014-01-06 19:59:09 +01:00
SpaceToad
b1f5a4b96a
initial set of experiments with RPC implementation
2014-01-06 19:57:54 +01:00
SpaceToad
69079dab94
Fixed lasers looking for tables on a regular basis, fix #1400
...
Attempt at improving SafeTimeTracker interface and implement
automatic randomization. If interface is confirmed, other places
in the code will need to be updated to the interface.
2014-01-05 17:47:48 +01:00
SpaceToad
c4cbdcc584
Implemented graphical animation for pulsing gates, close #1390
...
Fixed lit stage of gates, for #1401
2014-01-05 13:29:38 +01:00
CovertJaguar
8ee5270145
Merge branch 'marmot' into builder
2014-01-04 11:26:48 -08:00
CovertJaguar
b73a2d4f51
Fix Engine dupe
...
Closes #1361
2014-01-04 11:25:13 -08:00
CovertJaguar
f87e5c0add
Fix Gate lit state
2014-01-04 07:42:53 -08:00
CovertJaguar
23a3a7004d
Merge branch 'marmot' of https://github.com/BuildCraft/BuildCraft into marmot
2014-01-04 07:12:00 -08:00
CovertJaguar
2f7f6635fc
comments
2014-01-04 07:11:43 -08:00
SpaceToad
fd058efd01
fixed location of icon for eneryg pulsar, following #1391
2014-01-04 16:06:33 +01:00
SpaceToad
197c5b7edf
Implemented icons for pulsar and single pulsar, close #1391
2014-01-04 15:43:44 +01:00
CovertJaguar
5d9a9fa4e0
Add some stat tracking ability to the Power API
2014-01-03 16:47:30 -08:00
CovertJaguar
7fc7f25661
Bump Power API version
2014-01-03 01:32:19 -08:00
CovertJaguar
bb527bb48c
Merge branch 'marmot' into builder
...
Conflicts:
common/buildcraft/BuildCraftCore.java
2014-01-03 01:21:50 -08:00
CovertJaguar
ee71e86409
Merge branch 'nightly' into marmot
2014-01-03 01:19:52 -08:00
CovertJaguar
6c73c1a070
Convert Power API to use Double instead of Float
...
Closes #1288
2014-01-03 01:17:19 -08:00
CovertJaguar
da35a13f45
Fix derpy Filler Pattern selection
...
Closes #1394
2014-01-02 05:16:09 -08:00
CovertJaguar
3b0a047570
Finalize Gate Rework
...
-Added Integration Table Recipes
-Finished and tested Integration Table
-Re-added all Gate recipes
-Clean up Pipe Wires, Chipsets, etc...
Changes:
-Gate Logic Swap recipes moved from Workbench to Integration Table.
-Pipe Wires condensed into a single Item
-Pipe Wires are now distributed evenly between the gates: Red with the
Basic Gate, Blue with Iron, Yellow with Gold, and Green with Diamond.
Recipes adjusted to match.
As of this commit, Gates should be both craftable and usable again. The
Integration Table is also ready to be used. Gate Expansions are
completely implemented and usable.
Enjoy!
2014-01-02 04:58:08 -08:00
CovertJaguar
0c057f28d1
Flesh out remaining Integration Table details
...
No recipes defined yet, so no idea if it actually works.
2013-12-29 03:05:21 -08:00
CovertJaguar
173aabf91d
Implement Integration Table logic
2013-12-28 23:01:15 -08:00
CovertJaguar
edf8f17a6f
Add Integration Table Recipe API
2013-12-28 01:24:18 -08:00
CovertJaguar
4356c1098b
Refactor Laser Tables to share common ancestor
2013-12-28 01:11:03 -08:00
CovertJaguar
fedb4d5a42
Merge branch 'nightly' into marmot
2013-12-28 00:43:25 -08:00
CovertJaguar
d77ee030c2
Modify Pipe RayTrace to better reflect EyeHeight
2013-12-28 00:41:05 -08:00
CovertJaguar
5150d01672
Add Redstone Fader Exp + major cleanup
2013-12-27 08:40:44 -08:00
Speiger Bär
d3a178375e
Added gate changing on FluidPipes
2013-12-26 01:14:26 +01:00
CovertJaguar
4e3f4c1e94
Rewrite Timer Trigger so it actually works...
...
...and add Clock Timer Gate Expansion.
2013-12-24 00:22:17 -08:00
CovertJaguar
b3aa1aaafd
Missed a line
2013-12-23 23:29:36 -08:00
CovertJaguar
d9f655d52b
Merge branch 'marmot' into builder
...
Conflicts:
common/buildcraft/BuildCraftCore.java
common/buildcraft/builders/TileBuilder.java
2013-12-23 23:28:19 -08:00
CovertJaguar
f353d04feb
Merge branch 'nightly' into marmot
2013-12-23 17:07:14 -08:00
CovertJaguar
46612e4e3c
Desert Oil Biome should decorate
...
Closes #1374
2013-12-23 17:02:03 -08:00
CovertJaguar
f67d1a29b8
InventoryIterator should support Double Chests
...
Closes #1363
2013-12-23 16:58:46 -08:00
CovertJaguar
b64a8977c6
Modify Trigger API slightly to support Expansions
...
Unfortunately, this will break existing mods. But its a simple fix, just
implement the ITileTrigger interface.
2013-12-23 16:49:04 -08:00
CovertJaguar
1cb20ea59d
Kill Gate Icon Provider, and cleanup unused icons
2013-12-21 19:49:20 -08:00
CovertJaguar
a0c2e5807c
Serialize and Sync Gate Expansions
...
Expansions are synced in a similar manner to fluid ids. A packet is sent
on login with a String<->Byte mapping for each Expansion. The Pipe uses
this lookup table construct the Gate on the client side.
Remaining Todo List:
-Add Integration Table for adding Expansions to Gates
-Add Deconstruction Table for dismantling Gates
-Adapt Clock Timer Expansion to new framework
-Add Redstone Fader Expansion (name not final)
2013-12-21 19:11:51 -08:00
CovertJaguar
88c320a56b
Move Pipe API into transport for now
2013-12-20 17:01:05 -08:00
CovertJaguar
c1cd0fa02b
Remove IPipe, cleanup IPipeTile
2013-12-20 16:55:47 -08:00
CovertJaguar
0c438361e5
Code clean up
2013-12-20 16:27:01 -08:00
CovertJaguar
ae3a89bfe9
Clean up Fluid Update Packet
...
It was sending a ton of unused bytes, whoever did the Liquid->Fluid API
update left a bunch of old metadata related stuff in.
Also checking for valid fluids is necessary because its possible for
FluidStack.getFluid() to return null.
2013-12-19 20:36:58 -08:00
CovertJaguar
547c5d28ea
Slow Item Pipe max speed so the code can keep up
2013-12-19 05:36:29 -08:00
CovertJaguar
986f407af6
Merge nightly into marmot
2013-12-19 05:35:40 -08:00
CovertJaguar
10daf6f202
Remove any possibility for CCMEs in Item pipes
...
Fixes
http://forum.feed-the-beast.com/threads/direwolf-20-1-6-4-public-beta.35476/page-18#post-500244
I should note that I still can't see how that could have happened, this
commit just made it utterly impossible.
2013-12-19 04:41:57 -08:00
CovertJaguar
c9acef05ca
Improve perf of ACT by caching OreDict info
2013-12-19 03:33:22 -08:00
CovertJaguar
2936d76b95
Add a null check in dropItems()
2013-12-13 15:27:10 -08:00
CovertJaguar
35611e0bf7
ACT needs to support recipes with variable outputs
...
For example, ChristmasCraft Gifts that use input item NBT to determine
the output item.
2013-12-13 15:22:21 -08:00
CovertJaguar
70822c0178
Add additional support for Gate Expansions
...
Things left to do:
-Sync expansions on the pipe to the client
-Rewrite Assembly table to support modifying Item NBT so you can add
expansions to Gates
2013-12-10 02:02:35 -08:00
CovertJaguar
acef0b4d60
Fix Gate Rendering
...
Layers!
2013-12-10 01:02:21 -08:00
CovertJaguar
4a21f4ce24
Notify player of inv changes when filling
2013-12-08 21:03:29 -08:00
CovertJaguar
d7575d74ea
Wrenches shouldn't stack
2013-12-08 21:02:46 -08:00
CovertJaguar
a4032762bc
Merge branch 'marmot' of https://github.com/BuildCraft/BuildCraft into marmot
2013-12-08 16:57:03 -08:00
CovertJaguar
5be3a5c6a0
Fix Engine dupe
...
Closes #1361
2013-12-08 16:56:40 -08:00
Charles Comstock
ef71c35ad2
Extract GL.color(int color) for unpacking hex RGB
...
Centralizes all the unpacking of hex RGB values from an integer to a
single call to GL11.glColor4f.
2013-12-08 02:42:14 -06:00
CovertJaguar
0a4193b72e
Some more minor optimizations
2013-12-05 18:05:32 -08:00
CovertJaguar
10015f8ffb
Remove Fluid Motion Event, they cost too much CPU
...
And I'm told they are going away in the future.
2013-12-05 17:01:09 -08:00
CovertJaguar
7ee74d56a1
First Iteration of Gate Rewrite
...
GateKind enum is gone, replaced with two enums: GateMaterial and
GateLogic.
Pulsars and Timers are abstracted into GateExpansions that can be
applied to "upgrade" a gate. (Incomplete)
GateExpansions will eventually be moved to the API so that other can
define new expansions easily.
GateExpansions are not currently serialized or synced to the client.
This remains to be done.
Legacy migration support is included, but untested.
Currently only the base logic texture layer (white/black) are being
rendered. Eventually the material and expansions will each render an
additional texture layer onto the gate.
2013-12-05 13:38:00 -08:00
CovertJaguar
f41cc82eca
Allow water springs to be disable independently of everything else
2013-12-05 09:56:03 -08:00
CovertJaguar
b788dfde6a
Merge master into builder
2013-12-03 18:41:13 -08:00
CovertJaguar
5f9e171de9
Merge pull request #1353 from ItsMeElConquistador/marmot
...
Added colorRenderCache to refinery filter slots
2013-12-03 00:13:43 -08:00
CovertJaguar
1acf4ba5b5
Cache Traveling Items
...
There existed a race condition where either the client could pass an
item from one pipe to another (with intact ItemStack NBT data) or a
packet could arrive from the server to inject the item into the pipe
(without NBT data). This resulted in incorrect Icons being occasionally
displayed for a moment for Items that use NBT to determine the Icon
(Forestry Bees/Trees).
To eliminate this race condition, all Traveling Items are now cached
(weakly) and ItemStacks are no longer sent as part of the Traveler
Packet. The client must instead request the ItemStack from the server.
The bonus being that the ItemStack (NBT and all) needs only be requested
when it first enters the network.
This also has the affect of further reducing bandwidth usage by Item
pipes, though it should be noted that Item pipes where already the least
bandwidth intensive pipe.
Additionally I rewrote the Item Grouping code. I'd never looked at it
before, but I figured I should make sure it properly maintains the pipe
state after grouping. What I found was 200 lines of wtf code that was
horribly outdated and broken. I replaced it with 20 lines of code that
are less dependent on implementation details of how pipes work. -.-
2013-12-02 17:45:08 -08:00
ElConquistador
76c35e28af
Added colorRenderCache to refinery filter slots
2013-12-02 21:09:22 +01:00
CovertJaguar
4b80435f3d
Merge Timer into Marmot
2013-12-01 22:27:42 -08:00
CovertJaguar
a6a4d46b29
Merge branch 'master' into marmot
2013-12-01 22:21:38 -08:00
CovertJaguar
c802c45c93
Random Pipe API musings
2013-12-01 22:15:03 -08:00
CovertJaguar
cc0298ce5b
Clean up Recipe API
2013-12-01 21:57:31 -08:00
ElConquistador
3776286e2e
Combustion Engine also now uses the colorRenderCache
2013-12-01 19:48:08 +01:00
ElConquistador
fb52387094
Added colorRenderCache to Tank and Refinery
2013-12-01 08:18:19 +01:00
ElConquistador
4a0d2d2478
Merge remote-tracking branch 'upstream/master'
2013-12-01 07:40:08 +01:00
CovertJaguar
b9b2f1a238
Add some API failsafes
2013-11-30 14:08:38 -08:00
CovertJaguar
1f65388c80
Another perf tweak
2013-11-30 13:57:25 -08:00
ElConquistador
5aab6ecf88
Merge remote-tracking branch 'upstream/master'
2013-11-30 18:20:03 +01:00
CovertJaguar
0dd0c6c885
Various minor performance tweaks
2013-11-30 08:49:10 -08:00
ElConquistador
6c770a90a1
Added a fluid color render cache so fluids that use colors will get properly renderered in pipes
2013-11-30 17:14:43 +01:00
SandGrainOne
ae67ae3a2c
Corrected method names in gold and void pipe.
2013-11-30 13:41:49 +01:00
CovertJaguar
5dd82d7a95
Don't render fluid in disconnected pipes
2013-11-29 19:32:45 -08:00
CovertJaguar
0cbc63e919
Version 4.2.0
2013-11-29 17:08:49 -08:00
ganymedes01
17e7cb9a11
Fix for Gates with ItemStacks with NBT data
...
Closes #1344
2013-11-29 06:56:52 -08:00
CovertJaguar
8fb3197276
Allow placement of Facades over Plugs
2013-11-29 06:50:07 -08:00
taelnia
3c51073653
Add call to onInventoryChanged to extraction pipes
2013-11-29 06:50:06 -08:00
CovertJaguar
38a6c81ab3
Pipe Block shouldn't appear in creative
2013-11-27 06:21:53 -08:00
CovertJaguar
ff227f9de9
Fix texture fighting on tank bottom
2013-11-27 06:21:52 -08:00
Yopu
25ee549253
Added quartz gates and chipsets.
...
Quartz gates act like gold gates with 2 exceptions:
They can connect to all pipe wire types.
There are 3 additional gate triggers that function as timers.
The timers have a short, medium, and long mode which can be set via config.
2013-11-25 20:29:36 -05:00
CovertJaguar
d9980fe99c
Merge pull request #1336 from viliml/patch-1
...
Add possible simpler way to send IMC facade requests
2013-11-25 17:26:39 -08:00
CovertJaguar
6b8ec69b37
Store owner information in the Tile
2013-11-25 12:44:01 -08:00
CovertJaguar
5c10517acb
Merge branch 'emzuli'
2013-11-25 12:27:32 -08:00
CovertJaguar
1b2f2ae730
Merge branch 'master' of https://github.com/BuildCraft/BuildCraft
2013-11-25 12:27:23 -08:00
viliml
1e24cf4d85
Add possible simpler way to send IMC facade requests
...
IMC has a built-in way of sending ItemStacks through it, and it would be simpler if mods could simply use that, instead of encoding the ID and metadata a string. Decoding is a lot simpler too, just one line.
2013-11-25 21:12:14 +01:00
CovertJaguar
65bff981e5
Fix block placement sync
...
Closes #1334
Closes #1335
2013-11-25 05:59:05 -08:00
CovertJaguar
52ce3ac8c3
Fix full inv item bounce client animation
2013-11-24 07:09:01 -08:00
CovertJaguar
0f63603bd6
Rework Diazuli Pipe routing to handle overflow
2013-11-24 06:50:23 -08:00
CovertJaguar
023a5d51fb
Some cleanup
2013-11-24 06:31:40 -08:00
CovertJaguar
6f57b4a80d
Logemerald->Emzuli Rework + PipeEvents
...
Modified Logemerald:
-Added ability to paint items as they are extracted
-Renamed to Emzuli, texture and recipe changed accordingly
PipeEvents:
-Added PipeEvents a replacement for Hook interfaces, precursor to 1.7
Pipe API
-Implement methods with signature "eventHandler(PipeEventClass event)"
to receive events
Widgets:
-General improvements for use as a button
2013-11-24 06:23:37 -08:00
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
Player
26a65250f2
minor blueprint db tweaks
2013-11-18 17:58:03 +01:00
Player
a035a15632
some work on the blueprint database, new unique id concept
2013-11-18 16:06:38 +01: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
CovertJaguar
7594b70a2e
Minor stuff
2013-11-15 21:19:25 -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
8f8e8f9b9b
Make it obey material costs
...
That was easier than expected!
2013-11-15 04:39:19 -08:00
CovertJaguar
0c9a923fc5
Fixed Lasers and added rotation support
...
Things it still doesn't do:
-blueprints are not persistent between sessions
-serialization code isn't being called and needs a rewrite
-material usage is not implemented
-path building doesn't exist
-vanilla block handlers don't exist
-templates don't work
2013-11-15 04:03:51 -08:00
CovertJaguar
12b11be88f
It Builds! Sort of....
...
Things it doesn't do:
-blueprints are not persistent between sessions
-serialization code isn't being called and needs a rewrite
-bounding box lasers won't appear
-orientation is wrong
-material usage is not implemented
-path building doesn't exist
-default block handlers don't exist
-templates don't work
2013-11-14 21:25:35 -08:00
CovertJaguar
39d869a993
Merge master into builder
2013-11-14 02:04:40 -08: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
6802882d42
Merge branch 'master' into builder
2013-08-19 14:04:17 -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
8c069901d2
Merge branch 'master' into builder
2013-08-08 17:32:04 -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
1c49760e80
Use Total World Time instead
...
Closes #1107
2013-08-08 17:20:22 -07:00
CovertJaguar
3321a6416b
Fix AWB dupe
2013-08-08 17:04:53 -07:00
CovertJaguar
fe08ada4b8
Merge master into builder
2013-08-07 14:59:15 -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
CovertJaguar
665cd81b9d
Merge mc16 into builder
2013-07-28 21:40:27 -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
CovertJaguar
29eb8776a4
Merge pull request #1006 from adamros/mc16
...
Clean up inventory code, chat message changes
2013-07-16 14:34:13 -07:00
CovertJaguar
61a0e89c4d
Smash PipeLogic hard
...
PipeLogic is now only used by Iron and Wooden pipes. All other pipes use
the empty PipeLogic() class.
Pipe connections are now handled by the new PipeConnectionBans class.
2013-07-16 14:13:57 -07:00
CovertJaguar
80a249e810
An attempt to make pipes movable
2013-07-16 12:58:31 -07:00
Adam Rosadzinski
81886bc8d7
Clean up inventory code, chat message changes
...
Remove support for non-existing ISidedInventory from Forge
Fixed sending chat message to player - 1.6 changes
2013-07-16 15:40:35 +02:00
CovertJaguar
0b5d898469
Catch uncaught IOException
2013-07-16 04:27:13 -07:00
CovertJaguar
bb4b5062bc
Refinery fixes + StreamPayload
...
Added a alternative payload system for update packets that uses data
streams instead of arrays. Note: It is not compatible with
@TileNetworkData so you will have to handle all the data yourself.
Also added a TankManager class to contain commonly needed code for
tanks: Serialization, TankInfo, Network Data, etc...
The Refinery still needs a fair bit of work, but its mostly limited to
the GUI filter code. That needs a complete rewrite of some kind since
Fluids aren't items and can't be rendered as such.
2013-07-16 03:50:45 -07:00
CovertJaguar
2f97f80352
Add javadoc (test commit)
2013-07-15 13:06:39 -07:00
CovertJaguar
01e2cc80d5
Revert "Revert Builder changes"
...
This reverts commit b44d60f4fe
.
2013-07-15 13:06:38 -07:00
CovertJaguar
d6200ab9a5
Horizon Pattern shouldn't block if no stack
2013-07-15 13:06:37 -07:00
CovertJaguar
33422087a3
Clean up Iron Engine APIs
2013-07-14 12:09:54 -07:00
CovertJaguar
b44d60f4fe
Revert Builder changes
...
I don't know how these got merged, but they shouldn't have been.
2013-07-14 11:58:43 -07:00
CovertJaguar
eecc8ebf36
Fix current language
2013-07-12 19:06:13 -07:00
CovertJaguar
d607eaae9b
Merge branch 'mc16' into builder
2013-07-12 18:46:10 -07:00
CovertJaguar
4dd867d606
Fix getWorld() function
2013-07-12 17:40:06 -07:00
CovertJaguar
425515504d
Make Oil burn again
2013-07-12 17:10:52 -07:00
CovertJaguar
efcdbeb8c5
Merge mc16 into Builder
2013-07-12 16:54:26 -07:00
CovertJaguar
62a75524c8
Tweak Pipe Fluid renderer
2013-07-12 16:41:06 -07:00
CovertJaguar
a3e30d57cc
More update work
...
Fluids are mostly converted, including rendering and registration. Added
Fuel Block.
2013-07-12 16:38:03 -07:00
CovertJaguar
1d11beaa6b
More update work
2013-07-12 14:21:44 -07:00
CovertJaguar
5aecd9aa87
Merge Power into mc16
2013-07-12 10:37:11 -07:00
SirSengir
f074c0ad6a
Fix incorrect casts in gui code.
...
Caused by removed IInventory implementations.
2013-07-10 20:39:48 +02:00
Christian
103a8c124b
First draft 1.6. Lots still to do. :(
2013-07-07 22:57:05 -04:00
SirSengir
0cd627ce0d
Unused imports must die. Some formatting.
2013-07-06 09:41:47 +02:00
Christian
190e6a2935
Merge branch 'master' into power
2013-07-05 14:32:26 -04:00
Christian
1e0fa98484
Fix facade rotation. It works again with new meta system.
2013-07-05 13:50:50 -04:00
CovertJaguar
d0a7a64505
Exploding Engines should kill themselves
...
Added because someone decided turning off explosions was a good idea.
2013-07-04 03:37:36 -07:00
CovertJaguar
93409516b1
Merge branch 'power' into builder
2013-07-04 03:22:41 -07:00
CovertJaguar
f83e2072d6
Merge branch 'master' into power
2013-07-04 03:22:07 -07:00
CovertJaguar
d1a39072af
Removed unneeded ISpecial refs
2013-07-04 03:20:28 -07:00
CovertJaguar
392498ff74
Fix brightness issues with Quarry/Pump
2013-07-04 03:07:46 -07:00
CovertJaguar
599afc578e
Cleaned up some code.
2013-07-04 00:30:15 -07:00
CovertJaguar
71c79606c0
Fix typo in javadocs
2013-07-02 08:01:09 -07:00
CovertJaguar
c3a54f2a24
Added IPowerEmitter
2013-07-02 07:56:36 -07:00
CovertJaguar
5492f83a31
Should fix Wooden Power Pipe power sources issues
2013-07-02 07:11:57 -07:00
CovertJaguar
c3d1df0c4e
Merge Power into Builder
2013-07-02 06:56:03 -07:00
CovertJaguar
55c4abac12
Merge branch 'master' into power
2013-07-02 06:50:45 -07:00
CovertJaguar
9489bbb508
Merge branch 'master' into SandGrainOne-FilteredBuffer
2013-07-02 06:45:26 -07:00
CovertJaguar
4d547c89f4
Moved everything again.
...
Fleshed out Schematic classes.
Quarry works in this build.
2013-07-02 06:42:34 -07:00
CovertJaguar
499b6f342d
Re-add update function
...
Some weirdness occurs with some applications without it unfortunately.
2013-07-01 15:53:33 -07:00
CovertJaguar
9daec45638
Fixed perdition issues
2013-07-01 15:26:57 -07:00
CovertJaguar
af89a9470b
Power API Take 3
2013-07-01 14:21:51 -07:00
CovertJaguar
3a8c0f95c8
Significant rework of API
...
Moved everything not needed out of API package.
Rewrote BlockHandler and BlockSchematic to be more NBT dependant.
2013-07-01 05:40:51 -07:00
CovertJaguar
9262324160
Fix pipe plug select box + fill/drain
...
It should now be possible to add plugs to adjacent pipes without
breaking either pipe.
2013-07-01 00:44:38 -07:00
CovertJaguar
3cdcf094db
Added color modifier support to Facades
2013-06-30 23:21:55 -07:00
CovertJaguar
670c2684e7
Fix Iron Engine heat issues
2013-06-30 17:52:57 -07:00
CovertJaguar
4a1469a055
Convert TileQuarry and EntityRobot to new API
...
Note this breaks the builder.
2013-06-30 17:49:20 -07:00
CovertJaguar
705798b744
Fix Iron Engine heat issues
2013-06-30 17:44:47 -07:00
CovertJaguar
6cdf94b109
First iteration of BlueprintBuilder
...
Some significant hurdles remain to be overcome in regard to how the
BlueprintBuilder interacts with EntityRobot.
Also, rotation and builder positioning is a massive headache that still
needs to be tackled.
2013-06-30 06:09:44 -07:00
CovertJaguar
2e4f27ba6a
Merged Power into Builder
2013-06-30 00:48:33 -07:00
CovertJaguar
fd73836a67
Add Blueprint and Serialization
...
Also renabled the Builder for testing purposes.
2013-06-30 00:46:15 -07:00
CovertJaguar
88b98d044b
Cleaned up buffer code a bit.
...
Just headers and stuff, and moved one of the slots out of the container
because it might be useful for other stuff.
2013-06-29 18:59:04 -07:00
SandGrainOne
370c33ee70
Adding FilteredBuffer
2013-06-29 19:03:36 +02:00
CovertJaguar
b1041e19d6
Some minor bits
2013-06-29 03:22:55 -07:00
CovertJaguar
593d889468
Fixed Legacy code
2013-06-29 02:21:54 -07:00
CovertJaguar
f92576ed36
Forgot a minor bit the alt impl
2013-06-29 01:37:41 -07:00
CovertJaguar
b25b08c827
Engine rewrite
...
Killed Engine class, merged into TileEngine and subclasses.
Converted to Forge rotation API.
Split heat from stored energy and set proper temp bounds.
Rewrote IronEngineCoolant API, changed to degree based temp reductions
(its 0.0025 times the previous values). Added support for solid coolants
(they have to melt into a liquid coolant, like Ice to Water).
There is a commented out alternative implementation for constant power
output instead of pulsed.
2013-06-29 01:33:21 -07:00
Krapht
8867512f38
Removed crafting/Creative inventory for Blueprints, Architect table and blueprint library
2013-06-28 20:36:02 +02:00
SirSengir
365d9a27d6
Fix determination of crafting equivalency.
...
Items can be registered with multiple ore ids in the OreDictionary. A direct comparison of the ore ids may fail in that case.
2013-06-28 20:05:48 +02:00
CovertJaguar
f9374eb0e5
Fixed Wooden Item and Liquid Pipes
2013-06-27 14:33:33 -07:00
CovertJaguar
c8db1dcb19
Merge branch 'master' into power
2013-06-27 13:49:31 -07:00
CovertJaguar
12de71213a
Convert Pipe Icon Prov to enum
...
And fixed a issue with the PowerProvider casting objects to TileEntities
that aren't TileEntities. Fixed by adding a getWorldObj() function to
IPowerReceptor.
2013-06-27 13:10:01 -07:00
CovertJaguar
42181dbc7f
Remove min check on receive
...
The check broke pipes
2013-06-26 08:50:25 -07:00
CovertJaguar
1d7e160d2f
Some cleanup
2013-06-26 08:35:34 -07:00
CovertJaguar
080a4d6ca4
Added bounds checks for set
2013-06-26 08:22:19 -07:00
CovertJaguar
fe6d2e6b3a
Add some Javadocs
2013-06-26 08:02:05 -07:00
CovertJaguar
2b5dc5c9ff
Minor stuff
2013-06-26 07:29:32 -07:00
CovertJaguar
b92c81f638
Changes for KL and cpw
...
Added set/add for KL
Added perdition calculator for cpw
2013-06-26 07:26:07 -07:00
CovertJaguar
91a3ac95c6
Don't need to pass receptor, already have it
2013-06-25 20:54:21 -07:00
CovertJaguar
2d281c56d1
Opts
2013-06-25 20:25:03 -07:00
CovertJaguar
73aa6260a6
Removed update return value, meaningless, unused
2013-06-25 20:21:01 -07:00
CovertJaguar
475d6cd2f5
Make receptor public
2013-06-25 20:08:22 -07:00
CovertJaguar
013fe4ecb4
Possible Tickless compatible system PowerProvider
...
doWork() callback is now handled in receiveEnergy() as well as in the
tick update. So you can respond more effectively even if you don't want
to tick.
2013-06-25 19:46:07 -07:00
viliml
1d0a902217
Update BlockQuarry.java
...
Fixes https://github.com/BuildCraft/BuildCraft/issues/972
2013-06-25 19:31:28 +03:00
CovertJaguar
4f6ba954cd
Better connection rules
2013-06-25 05:23:41 -07:00
CovertJaguar
8d1b33b268
Pipes won't connect to a receptor with no provider
...
And a tweak to powerRequest()
2013-06-25 01:29:11 -07:00
CovertJaguar
1f8c9f78ee
Power API rewrite
...
PowerFrameWork is gone.
PowerProvider is final.
Can have multiple PowerProviders (one for each block side).
PowerProviders can either accept power from pipes or they can't, defined
in constructor.
Removed a bunch of excess code that just cluttered the API.
2013-06-25 01:00:24 -07:00
CovertJaguar
ee02561cd0
Adjust pump for new default
2013-06-24 21:22:45 -07:00
CovertJaguar
b223fd4440
Increased default power perdition to 1 MJ/t
2013-06-24 21:15:49 -07:00
CovertJaguar
8b6546a8bd
Fixed Power Request Trigger
...
Its now restricted to Wooden Power pipes.
Before:
The trigger was useless because it was triggering off the powerQuery
array which was always true so long as there was any device on the
network requesting power. This made it rather useless for scaling
production to demand.
After:
It now triggers whenever the Wooden Power Pipe's internal power buffer
drops below a certain point. This however required a modification of the
wooden pipe's internals because it was getting stuck in the "Off" state
due to how it handled transferring power from the buffer to the pipe
network.
Anyway, it works now and is somewhat useful.
Note: The Wooden Power Pipe's internal buffer stores 1500 MJ, this was
true even before this commit.
2013-06-24 21:02:48 -07:00
CovertJaguar
5f58280e5f
Merge branch 'master' of https://github.com/BuildCraft/BuildCraft
2013-06-24 18:15:06 -07:00
CovertJaguar
c50847c196
Added two new Power Pipe Triggers
...
Requests Energy: Activated when the pipe has an active power request.
Use to allow your network to respond to demand dynamically.
Energy Overloaded: Activated when the pipe turns red, in case anyone
wants to know when that happens.
2013-06-24 18:13:54 -07:00
Christian
22b202fb25
Fix single energy pulse
2013-06-24 20:22:31 -04:00
CovertJaguar
318eb5c4a7
Crafting generally ignores NBT, we should too
...
Let the recipe decide.
2013-06-24 06:13:15 -07:00
CovertJaguar
fb374cf7fc
Increased Mining Well cost per block
...
Its now the same as the quarry, 60 MJ per block.
Also tweaked power provider settings on the Mining Well and Quarry to
prevent smaller engines from being unable to overcome the maintenance
drain.
2013-06-24 05:43:27 -07:00
CovertJaguar
0882dadce3
Fixed a bug that was causing pipes to leak excess
...
This is an interesting commit, it not only fixes the RS Cells
(@King_Lemming) it also makes it so the network can respond to demand as
needed by shutting down overheating engines, since the pipes won't
accept power now unless something is requesting it.
2013-06-21 17:28:22 -07:00
CovertJaguar
cdebf25a03
Cleaned up engine power display
2013-06-21 17:13:54 -07:00
CovertJaguar
fc0df8e84f
Removed a bit of unneeded code in the Wood PPipe
...
@King_Lemming this will break compat with RS Cells because you're doing
it wrong. Don't use powerRequest() like that and don't ignore the return
of receiveEnergy().
PS. It was already broken because the cell was just throwing power away
because it was ignoring the return of receiveEnergy().
2013-06-21 16:44:07 -07:00
CovertJaguar
951292da37
Reduce Oil chance in deserts, etc...
...
Blame this one on myst's flatlands.
2013-06-21 04:31:17 -07:00
CovertJaguar
1e3d704fd4
ACT can handle damagable items correctly now
...
Note it still can't (and probably won't ever be able to) handle
wildcarded subtypes like different colored wool.
2013-06-21 03:14:28 -07:00
CovertJaguar
821605b71d
Fix for Refinery not accepting power
2013-06-19 21:23:43 -07:00
CovertJaguar
d4c5452a1c
Added Power throughput tooltip to power pipes
2013-06-19 17:48:24 -07:00
Player
4f740be088
Assembly Table: prevent planning recipies multiple times
2013-06-19 10:28:48 +02:00
Player
50efde2217
Assembly Table: use currentRequiredEnergy to scale the progress bar
2013-06-18 23:31:29 +02:00
CovertJaguar
32bab2251e
Mining Well should break pipes when invalidated
2013-06-18 03:14:19 -07:00
Dylan Miller
d9da8bddc5
Fixed pipes rendering in hand as flat texture
2013-06-16 14:20:25 -07:00
Player
0c6ad8f247
fix last commit, wrong texture sheet
2013-06-16 22:01:21 +02:00
Player
1e0d1eb750
Add fallback to the missing icon while rendering pipes in the inventory
2013-06-16 21:51:20 +02:00
CovertJaguar
a0f57c57ca
Wooden Power Pipes now add power to themselves...
...
...instead of their neighbor. The result being that they are constrained
by the new limits and that they actually render the power flow in
themselves.
Wooden Pipes are set with a input cap of 32 MJ/t, buffed from the
previous effective limit of 29 MJ/t.
Note that this also effectively adds a 32 MJ/t pipe that can be used for
limiting flows.
2013-06-15 16:27:43 -07:00
CovertJaguar
40b8c72ada
Added rotation helper
2013-06-14 23:19:56 -07:00
CovertJaguar
633b650110
We don't need x,y,z to get a handler
2013-06-14 22:52:52 -07:00
CovertJaguar
03c308a599
Javadoc work
2013-06-14 22:39:54 -07:00
CovertJaguar
e178aad28d
Added Handler registration
...
I do not think we should provide a block interface, better to keep the
API self contained and separated from the actual block implementations.
2013-06-14 22:25:25 -07:00
CovertJaguar
1dda771c18
Removed Schematic orientation
...
The block already stores that info in meta or NBT anyway. A separate
field isn't really needed.
2013-06-14 22:06:29 -07:00
CovertJaguar
a5e2be13af
Initial commit of a possible Builder API
2013-06-14 22:02:37 -07:00
Player
e18031d223
fix AssemblyTable processing client-side
2013-06-14 19:32:49 +02:00
Alex Binnie
91430f4279
Changed Assembly Table Recipe packets to NBT
2013-06-14 17:45:48 +01:00
Alex Binnie
d62a0d440c
Facades now store both block id and meta in nbt
2013-06-14 17:09:11 +01:00
Alex Binnie
8933df795a
Support for facades with metadata >= 16 by using NBT
2013-06-14 00:18:11 +01:00
CovertJaguar
7a320cbba0
Added progress bar to ACT
2013-06-13 15:09:55 -07:00
CovertJaguar
4ac9a0fc45
Fixed ACT support for OreDict/Wildcards
...
Also gave StackHelper a proper static accessor, one that should be
compatible with Krapht's Tests.
2013-06-13 14:35:54 -07:00
CovertJaguar
782995b035
Merge branch 'master' of https://github.com/BuildCraft/BuildCraft
2013-06-13 13:51:25 -07:00
CovertJaguar
77b92a8ce9
Added Oil Burn config
2013-06-13 13:50:51 -07:00
SirSengir
c2465a7cf8
Don't get the oreID twice if it isn't needed.
2013-06-13 18:08:25 +02:00
CovertJaguar
7b818ec45c
Wrong header (oops)
2013-06-12 21:41:25 -07:00
CovertJaguar
69736013e6
Minor rework of ACT (Laser)
...
Split inventory into input/output sections.
Added support for retrieving ingredients from neighboring inventories.
Yes, this means crafting chains are possible.
Various other minor tweaks to when it requests power, how it decides it
has everything it needs to craft, etc...
2013-06-12 21:39:55 -07:00
CovertJaguar
fd548a4954
Add removal support to Transactors
...
Can only remove 1 item at a time, but that's almost always sufficient.
Also added a bunch of helper functions in InvUtils (moving items between
inventories, counting items, etc..).
2013-06-12 21:36:56 -07:00
CovertJaguar
d585770ce3
Limit Filler slots to 1 item
2013-06-12 21:34:07 -07:00
CovertJaguar
ad2ead2e89
Added Quartz Pipes
...
Item and Power.
Item Pipe won't connect to Stone or Cobblestone and has half the
friction of Stone.
Power Pipe takes the place of Gold (64 MJ/t) and bumps Gold and Diamond
up to 256 MJ/t and 1024 MJ/t respectively. Expanding the upper tier
power distribution capacity.
Various textures adjusted to keep pipes distinct.
2013-06-12 19:26:46 -07:00
CovertJaguar
61fe020b89
Proving once again that I cant spell
2013-06-12 14:56:48 -07:00
SirSengir
400cde7d78
Made TileAssemblyTable aware of OreDictionary.
2013-06-12 19:40:52 +02:00
CovertJaguar
da4ec07112
Better error
2013-06-12 08:56:27 -07:00
CovertJaguar
bb9ac3e1ca
Lets not break ABO
2013-06-12 08:52:44 -07:00
CovertJaguar
a949418fab
Fix potential Engine NPE
...
If somehow you get an engine with an invalid metadata value, it would
crash.
2013-06-12 08:26:52 -07:00
CovertJaguar
e996f64660
Some minor optimizations
2013-06-12 07:47:28 -07:00
CovertJaguar
5760844dae
Added Horizon Filler Pattern
...
This pattern is basically the old Flatten pattern that would clear all
the way to the sky.
Recipe
GGG
GGG
BBB
Flatten got a matching recipe:
GGG
BBB
BBB
2013-06-12 06:43:15 -07:00
CovertJaguar
d17a384a2f
Add pipe uncrafting recipes
...
Closes #677
2013-06-12 06:14:23 -07:00
CovertJaguar
69df314c36
A better attempt
2013-06-12 06:13:21 -07:00
CovertJaguar
7336dfd882
Attempt to prevent pipes from tossing excess
...
This NEEDS extensive testing. I only have a vague idea how this code
works.
The original code was just tossing any power beyond what it could
handle, with no throttle on how much it was requesting from its
neighbors.
I think its working, more or less, but you'd probably have to hook it to
some TE Cells or something to know for sure.
2013-06-12 03:36:22 -07:00
CovertJaguar
ff0e36a784
Immibis' Filler changes
...
Closes #838
2013-06-12 02:45:56 -07:00
CovertJaguar
8f7292ec06
Power Pipe rework
...
Explosions are gone, loss over distance is gone.
Added two new Power pipes, Cobble and Diamond.
All pipes have much smaller max throughput:
Cobble = 8 MJ/t
Stone = 16 MJ/t
Gold = 64 MJ/t
Diamond = 256 MJ/t
The power display will turn red if a pipe has hit its max capacity. You
can use smaller pipes to throttle certain parts of your power net.
Machines are more lossy now to make up for the lossless pipes. Expect
low power draws even when idle.
Also added on/off Gate action support to lasers and ACTs.
2013-06-12 02:35:15 -07:00
CovertJaguar
6dd4287945
Iron Engines now accept liquids via right click.
2013-06-11 23:02:47 -07:00
CovertJaguar
9891f99f25
Make Flatten less stupid
...
It now processes in columns, greatly increasing the performance.
It is no longer halted entirely by anything it can't break. In other
words, you can use it to fill over bedrock.
Changed how the clear portion works, it no longer clears all the way to
sky, instead it only clears IN the box.
2013-06-11 21:29:08 -07:00
CovertJaguar
d9702f43c5
Fix Laser brightness (again)
2013-06-11 21:26:01 -07:00
CovertJaguar
96b11465ed
And because I can't spell
2013-06-11 20:30:11 -07:00
CovertJaguar
9f72d8b5f1
Merge pull request #933 from DelusionalLogic/master
...
Fix gate texture update
2013-06-11 20:21:42 -07:00
CovertJaguar
e430d4c8dc
Make Markers less derpy
2013-06-11 20:19:58 -07:00
CovertJaguar
3b113b9f2e
More tweaks
2013-06-11 15:44:51 -07:00
CovertJaguar
bbc5881fd0
More Oil gen rebalancing
...
Reduced the chances of spawning wells.
2013-06-11 14:54:15 -07:00
DelusionalLogic
d663104a0b
Turns out you indent with tabs
2013-06-11 23:12:27 +02:00
Jesper Jensen
eaae07352b
Optimized pulser disable slightly
2013-06-11 23:10:06 +02:00
Jesper Jensen
d9b3fd1842
Fixed gate pulser texture update
2013-06-11 23:01:17 +02:00
SandGrainOne
a1340f864c
Fix for duplication bug.
...
It was possible to get the item in a phantom slot with the new inventory
management features. This prevents for example the item double click
feature (make stack) to take items from the ghosted inventory.
2013-06-11 23:00:08 +02:00
CovertJaguar
8854353da3
Fix ACT eating Minium Stones
...
Closes #931
2013-06-11 12:41:28 -07:00
CovertJaguar
b34c96cc06
Fix Filler pipe interaction
2013-06-11 00:58:58 -07:00
CovertJaguar
2b0588fe5f
Fixed minor GUI issue with AWB
2013-06-10 17:12:02 -07:00
Christian
e6c0361f4f
Add support for rotated log textures. To change a facade, put it in your crafting grid- it'll turn around..
...
Works with any mod logs using render 31 as well..
2013-06-10 20:02:38 -04:00
CovertJaguar
3ea39c78bb
NPEs must die!
...
Closes #927
2013-06-10 14:16:41 -07:00
CovertJaguar
8d5e520c96
Randomize potential oil biome spawns on worldseed
...
Also reduced Oil Ocean Biome chances again.
Previously it was using the same noise field for all seeds. Now it
randomly offsets the noise field based on the world seed. Its not truly
random, but at least you won't be able to travel to the same coordinates
in every world and find an Oil Biome.
2013-06-10 13:52:14 -07:00
CovertJaguar
f404eccb3d
Fix possible NPE in Wrench
2013-06-10 11:40:05 -07:00
CovertJaguar
8a9314a8f6
Fix critical dupe bug in AWB
...
Closes #895
2013-06-10 03:37:44 -07:00
CovertJaguar
f19ab165ef
Oil Tweaks
...
Fix Oil being consumed by Fire.
Reduce Oil Biome oil spawn bonus: 40x -> 30x.
Nerf Ocean Oil Field spawns a bit.
Fix Oil on Water, Closes #919
2013-06-10 03:27:58 -07:00
Christian
0bb43992d7
Attempt to workaround trigger api change for backward compatibility
2013-06-08 13:37:41 -04:00
Krapht
5662741cd2
Remove old double-chest detection code and use the vanilla approach. Fixes #914
2013-06-07 02:17:31 +02:00
Player
f04af071b8
Fix pump not passing through air blocks
2013-06-01 02:11:38 +02:00
CovertJaguar
fa3d0bb7b6
Smarter space check for buffer.
2013-05-29 09:49:53 -07:00
CovertJaguar
e43cf0a2b6
Add legacy migration to AWB
...
This should prevent wiping of the crafting grid on upgrade.
2013-05-28 23:16:56 -07:00
CovertJaguar
02e2fadcf4
Tweaks and code cleanup
2013-05-28 22:54:59 -07:00
CovertJaguar
8a6022962c
Name crafting fake players just in case
2013-05-28 20:21:22 -07:00
CovertJaguar
f581682158
Added some comments
2013-05-28 19:00:24 -07:00