Commit graph

2345 commits

Author SHA1 Message Date
SpaceToad
8c16501ee5 Made sure that blocks that are not build still issue breaking blocks.
Fix #1585 and #1622.
2014-04-27 16:20:59 +02:00
SpaceToad
e0f0e1dab6 increased amount of energy storable in builders and fixed infinite loop 2014-04-27 13:57:31 +02:00
SpaceToad
9b77c7d5f3 fixed quarry producing frame when destroyed, close #1632 2014-04-27 12:56:14 +02:00
SpaceToad
0abcd33e36 further fixes for lasers 2014-04-27 12:48:48 +02:00
SpaceToad
ce6e03a43a added rotation support for anvil and ender chests, part of #1580 2014-04-27 12:37:41 +02:00
SpaceToad
ebb4165670 added support for skulls in blueprints, part of #1580 2014-04-27 12:20:12 +02:00
SpaceToad
6186504d14 added support for trip wire hook, part of #1580 2014-04-27 11:45:57 +02:00
SpaceToad
e3edd9eda8 removed class added by mistake 2014-04-27 11:05:27 +02:00
SpaceToad
3a1c4acd26 Fixed builders not emptied in survival, for #1601.
Refactored StackUtil class to use static members.
2014-04-27 11:03:18 +02:00
Andrew Dudney
0f50e83564 Merge branch 'NextGen' of https://github.com/BuildCraft/BuildCraft into NextGen 2014-04-26 12:06:16 -06:00
Andrew Dudney
38bad1b5c4 Reverted previous change, I modified the wrong branch. 2014-04-26 12:01:55 -06:00
SpaceToad
2cecbcb18f removed OBE classes 2014-04-26 20:00:49 +02:00
Andrew Dudney
329850d4ea Re-added block breaking 2014-04-26 12:00:44 -06:00
Andrew Dudney
33ad9fee93 Merge branch 'NextGen' of https://github.com/BuildCraft/BuildCraft into NextGen 2014-04-26 11:58:57 -06:00
SpaceToad
046564f253 fixed laser animation, close #1629 2014-04-26 19:56:24 +02:00
Andrew Dudney
1abc6ec68f Changed hardness to a linear relationship rather than a clamping one. 2014-04-26 11:55:25 -06:00
Andrew Dudney
e931f9b4e5 Merged Main Repo NextGen, disabled Filler Block Breaking in this branch. 2014-04-26 11:41:18 -06:00
SpaceToad
69c8d75371 fixed loading of destroying builders blocks, fix #1623 2014-04-26 17:52:09 +02:00
SpaceToad
f0fe057371 Merge branch 'BuildCraft-5.0.x' of https://github.com/CrustyJew/BuildCraft into CrustyJew-BuildCraft-5.0.x 2014-04-26 16:53:09 +02:00
SpaceToad
5a8000707d replaced BC-specific constants with Forge-specific ones 2014-04-26 16:50:23 +02:00
SpaceToad
aa6d085e8b added protection against filler errors and fixed array out of bounds for cylinder, fix #1604 2014-04-26 16:39:26 +02:00
SpaceToad
c5a912a222 refactored to isolate API related functions, fix #1615 2014-04-26 16:10:57 +02:00
SpaceToad
5812d4f0bf Merge branch 'BuildCraft-5.1.x' into NextGen
Conflicts:
	buildcraft_resources/assets/buildcraft/lang/en_US.lang
	common/buildcraft/energy/BlockEngine.java
	common/buildcraft/factory/BlockTank.java
	common/buildcraft/transport/pipes/PipeItemsEmerald.java
2014-04-26 13:39:01 +02:00
SpaceToad
3fc344c9b9 Merge branch 'BuildCraft-5.0.x' into BuildCraft-5.1.x 2014-04-26 13:12:48 +02:00
SpaceToad
35791deb88 minor reformating 2014-04-26 10:21:54 +02:00
SpaceToad
2ce577bd39 Merge branch 'NextGen' of https://github.com/AlexIIL/BuildCraft into AlexIIL-NextGen 2014-04-26 10:20:53 +02:00
Meepster
1a1bb18a7a Forgot to trim ids.. Oops.. 2014-04-25 16:02:53 -05:00
Meepster
a6fa406793 Enabled use of BiomeDictionary.Type to pass in addition to IDs of
biomes. Added error handling. Doesn't seem to print the warning to the
log correctly though, just prints a string as info it looks.
2014-04-25 15:46:05 -05:00
Meepster
6892234a54 Changed Oil Generation to use config file ID's for generation to support
integration with mods like Biomes O' Plenty
2014-04-24 23:40:40 -05:00
Andrew Dudney
c316ffe30b Merge branch 'NextGen' of https://github.com/BuildCraft/BuildCraft into NextGen 2014-04-21 11:49:42 -06:00
dmillerw
d2214afee7 Fixed gates rendering incorrectly in GUIs 2014-04-21 07:21:05 -07:00
Andrew Dudney
98b68810a3 Fixed order of operations causing Has Work to flicker on and off when pointed at a clear Filler in loop mode that currently had no blocks to clear. Also fixes Fillers running while done and not in loop mode. 2014-04-21 02:20:26 -06:00
Andrew Dudney
7e5e277a4c Merge branch 'NextGen' of https://github.com/BuildCraft/BuildCraft into NextGen 2014-04-21 02:17:32 -06:00
SpaceToad
5d955a2e0d Merge pull request #1612 from TXX59/NextGen
Remove deprecated/redundant code in main classes
2014-04-20 19:04:06 +02:00
Andrew Dudney
1acc342af6 Removed redundant call to get the destination position for BuildingItem. 2014-04-19 16:09:37 -06:00
Andrew Dudney
2296519573 Changed minimum hardness to 1, so that digging dirt is no longer a free operation. Changed breaking blocks to have only the exact amount of red cubes sent toward them equal to their hardness. 2014-04-19 16:04:18 -06:00
Andrew Dudney
0799147b3f Merge branch 'NextGen' of https://github.com/adudney/BuildCraft into NextGen 2014-04-19 15:01:53 -06:00
Andrew Dudney
18f4c97f8b Re-added blocks dropping when filler clears them, this also applies to quarries and builders. 2014-04-19 15:01:25 -06:00
AlexIIL
9d9b134859 Update ReflectMjAPI.java
Removed a potential NPE (this can occur when a class contains a null mjBattery object)
2014-04-19 16:07:57 +01:00
robin4002
42d0e641b8 Fix ClassCastException in tile entity, close #1584 2014-04-19 15:27:00 +02:00
SpaceToad
b30995aea0 attempt at fixing blueprint building ordering, for #1620 2014-04-19 11:33:57 +02:00
SpaceToad
ee349e00b5 added mode where air blocks are not cleared by blueprint, close #1562 2014-04-18 23:05:34 +02:00
SpaceToad
6c42fd02bc fixed flatten and horizon filler patterns, fix #1598 2014-04-18 20:24:29 +02:00
SpaceToad
b8ec7635da fixed cactus handling in blueprint, fix #1597 2014-04-18 19:51:07 +02:00
SpaceToad
f4d1107066 fixed bed handling in blueprints, close #1617 2014-04-18 19:18:30 +02:00
SpaceToad
c5512cc42f fixed previous check-in for #1575 2014-04-18 09:25:32 +02:00
SpaceToad
d1dbabdabd completed builder status save, for #1575 2014-04-18 08:50:48 +02:00
SpaceToad
22f0ecdd36 finished saving state for blocks, for #1575 2014-04-18 08:23:48 +02:00
SpaceToad
b93c700a8a minor progress in saving builder state, for #1575 2014-04-17 21:00:56 +02:00
dmillerw
8fd7eb4f91 Merge pull request #1609 from dmillerw/engine
Fixed creative engine desync
2014-04-14 15:54:31 -07:00
SandGrainOne
fd9d9272b7 Change wire in recipe for gold gates 2014-04-14 20:38:24 +02:00
TXX59
11cdba5686 Remove deprecated/redundant code in main classes
I've done a bit of cleanup in the BuildCraft code by removing any
redundant/unnessecary little things and removing all deprecated
LanguageRegistry methods from main mod classes.
2014-04-14 17:27:59 +01:00
SpaceToad
a4744e6632 Merge pull request #1610 from robin4002/NextGen
Fix server crash
2014-04-14 17:09:57 +02:00
SpaceToad
d0994d6f6e Merge pull request #1607 from TXX59/NextGen
NextGen Achievements
2014-04-14 17:09:10 +02:00
robin4002
67c541676b Fix server crash 2014-04-14 14:07:52 +02:00
SandGrainOne
d5055969b0 Oil spouts wasn't visible above the ocean surface. 2014-04-14 01:00:51 +02:00
SandGrainOne
7d309d3399 Black list option for Emerald item pipe
Swapped out the multi state button with a button row.
Added a new button type with interfaces.
2014-04-13 22:08:33 +02:00
dmillerw
621a3f7525 Added missing header 2014-04-13 13:08:10 -07:00
dmillerw
b19eea0867 Merge remote-tracking branch 'bc/NextGen' into engine
Conflicts:
	common/buildcraft/energy/TileEngineCreative.java
2014-04-13 13:00:32 -07:00
dmillerw
2cc2183e23 Fixed creative engine desync 2014-04-13 12:59:40 -07:00
SpaceToad
e15ecdbac9 made progress in saving building items, for #1575 2014-04-13 19:22:41 +02:00
TXX59
0d0fd91d9d Oh hey look, another hotfix... 2014-04-13 17:25:20 +01:00
TXX59
87a4c7a379 Fixed import error 2014-04-13 17:24:25 +01:00
TXX59
152fc21b58 Fixed a little hiccup regarding achievements 2014-04-13 17:18:18 +01:00
SpaceToad
a65f6f5bb6 standardized headers 2014-04-13 18:05:32 +02:00
SpaceToad
b58653c90b Merge branch 'engine' of https://github.com/dmillerw/BuildCraft into dmillerw-engine 2014-04-13 18:03:42 +02:00
TXX59
fbfb697684 Add crafting events for NextGen achievements 2014-04-13 17:03:33 +01:00
TXX59
cce9ca6fb8 Add NextGen achievements 2014-04-13 17:00:18 +01:00
SpaceToad
30882a155b standardized headers 2014-04-13 08:52:48 +02:00
SpaceToad
e6d80a36e8 Merge branch 'texture' of https://github.com/dmillerw/BuildCraft into dmillerw-texture 2014-04-13 08:49:55 +02:00
dmillerw
b96480371e Make getTrunkTexture not abstract 2014-04-12 21:16:22 -07:00
dmillerw
daa828259d Engine rendering changes, as requested by @CyanideX 2014-04-12 21:13:42 -07:00
dmillerw
3fe4e3bfed Addition of creative engine 2014-04-12 18:31:37 -07:00
Anton
daa9ab82fb Update PipeTransportFluids.java 2014-04-12 23:42:01 +03:00
Anton
591313df43 Crappy temp fix for #1576
I think it's something with time.
2014-04-12 23:32:42 +03:00
dmillerw
8267cb87ee Start of the new block renderer 2014-04-11 19:27:38 -07:00
EXTER7
b9d2816f5a Fix Filtered Buffer registering twice.
Should fix crash in forge 1057.
2014-04-11 06:42:08 -07:00
SpaceToad
da36db0a0c fixed localisation of highlight handler 2014-04-10 22:23:25 +02:00
SpaceToad
863977bcd4 completed first version of builder state save, for #1575 2014-04-10 22:20:18 +02:00
SpaceToad
c5dec93711 made progress with builder save state, for #1575 2014-04-10 21:24:13 +02:00
SpaceToad
ea382ca443 Merge branch 'pipe' of https://github.com/dmillerw/BuildCraft into dmillerw-pipe 2014-04-10 08:51:33 +02:00
SpaceToad
039e49175b Merge branch 'facade' of https://github.com/dmillerw/BuildCraft into dmillerw-facade 2014-04-10 08:48:08 +02:00
SpaceToad
30df91675e Merge branch 'BuildCraft-5.1.x' into NextGen
Conflicts:
	common/buildcraft/core/utils/BlockUtil.java
2014-04-10 08:46:42 +02:00
dmillerw
aff0b01d3b Fixed pipes in inventory losing transparency in various situations 2014-04-09 22:08:21 -07:00
dmillerw
c721982546 Support for semi-transparent facades 2014-04-09 21:53:59 -07:00
Anton
5f03ba66a0 Should fix some issues(like grass) 2014-04-09 19:04:57 +03:00
SpaceToad
871638ddda fixed missing import 2014-04-09 08:54:28 +02:00
SpaceToad
2a2aec3a79 Merge branch 'NextGen' of https://github.com/anti344/BuildCraft into anti344-NextGen 2014-04-09 08:52:43 +02:00
Anton
ab0427ebd2 Improved bounding box for lasers! 2014-04-09 01:18:11 +03:00
Anton
bcf148e90d 'Generalize' engines. 2014-04-09 01:17:02 +03:00
Anton
9599cc0594 Delete old BlockHighlightHandler 2014-04-09 01:15:45 +03:00
Anton
409d28e45d Recreate BlockHighlightHandler in core package 2014-04-09 01:15:20 +03:00
Anton
f8f449cd93 Create ICustomHighlight.java 2014-04-09 01:13:50 +03:00
SpaceToad
43b1111ff6 fixed incorrect clearing for templates 2014-04-08 17:13:36 +02:00
Anton
7936fcece8 Whooooops =/ 2014-04-08 17:08:39 +03:00
SpaceToad
aa5915ed4e fixed template item selection 2014-04-08 15:56:56 +02:00
SpaceToad
7e0ece006b made sure requirements display as soon as the blueprint is loaded 2014-04-08 15:14:30 +02:00
SpaceToad
ca3b67880d fixed entities not using requirements 2014-04-08 14:50:02 +02:00
SpaceToad
1548d0fd68 relaxed constraints with item matching 2014-04-06 19:18:15 +02:00
SpaceToad
858efcb6f1 resurected survival recipes for builders 2014-04-06 18:15:09 +02:00
SpaceToad
d66a0e6271 some progress on the new energy system, for #1578 2014-04-06 18:05:39 +02:00
Anton
84b1d58320 Fix incorrect block placing on engines 2014-04-06 17:42:07 +03:00
Anton
ca1eb0b4ee Fix collision boxes. 2014-04-06 17:39:51 +03:00
Anton
b7a7cd0120 >_< 2014-04-06 17:00:21 +03:00
Anton
5d762c6f6d Raytrace check and proper collision boxes. 2014-04-06 16:59:11 +03:00
Anton
17e5e266cf Create BlockHighlightHandler.java 2014-04-06 16:58:06 +03:00
Anton
7b888559b8 Register BlockHighlightHandler class 2014-04-06 16:57:34 +03:00
SpaceToad
69825c8fc8 fixed item translations in inventories, fix #1565 2014-04-06 14:39:21 +02:00
SpaceToad
c55f124408 improved schematic architecture with regards to translations 2014-04-06 13:52:43 +02:00
SpaceToad
7bde6b7903 fixed entity schematic building, part of #1565 2014-04-06 00:51:02 +02:00
SpaceToad
b07d0b059d made progress for item requirements support in blueprints, for #1565 2014-04-05 19:03:53 +02:00
SpaceToad
a9701ec4e4 finished quarry fixing, fix #1561 2014-04-05 18:09:44 +02:00
SpaceToad
ac055f0b4f made progress at resurecting Quarry, for #1561 2014-04-05 17:31:59 +02:00
SpaceToad
757bea50dc improved block destroy animation, and implemented filler pattern 2014-04-05 16:10:39 +02:00
SpaceToad
2431d82225 fixed builder accepting items, fix #1555 2014-04-05 15:33:37 +02:00
SpaceToad
4bdbd13051 fixed architect progress bar, for #1546 2014-04-05 15:29:33 +02:00
SpaceToad
eb6293b0fe Merge branch 'BuildCraft-5.1.x' into NextGen 2014-04-05 15:15:53 +02:00
SpaceToad
2a57a81b51 Merge branch 'BuildCraft-5.0.x' into BuildCraft-5.1.x 2014-04-05 15:14:26 +02:00
SpaceToad
ee854df500 fixed blueprints names problems in client/server, fix #1566 2014-04-05 15:09:46 +02:00
SpaceToad
fea765d875 fixed energy usage in creative and stone/gravel requirements, fix #1558 2014-04-05 14:36:08 +02:00
SpaceToad
2cd973caab various fixes, including taking into account non-breakable blocks for #1501 2014-04-05 14:18:55 +02:00
SpaceToad
115a340e80 finished resurection of item / energy consumption, fix #1503 2014-04-05 11:28:58 +02:00
SpaceToad
49ef1c9c29 made progress in destroy animation, for #1571 2014-04-05 00:09:31 +02:00
SpaceToad
c3c3a3d3f0 made progress in improvement of block breaking, for #1571 2014-04-04 09:33:55 +02:00
SpaceToad
1d97913609 re-implemented item consumption in filler and templates, for #1503 2014-04-04 08:56:17 +02:00
SpaceToad
3e67e803fc removed unused code 2014-04-03 08:50:35 +02:00
SpaceToad
8a76edd91a fixed duplate method 2014-04-03 08:44:33 +02:00
SpaceToad
78cef2a3b8 Merge branch 'BuildCraft-5.0.x' of https://github.com/fabricator77/BuildCraft into fabricator77-BuildCraft-5.0.x 2014-04-03 08:42:38 +02:00
fabricator77
f466217553 Update BuildCraftEnergy.java 2014-04-03 12:42:26 +10:30
fabricator77
a016be6919 Auto assign Biome Ids
Finds unused Biome IDs if the ones in the config are in use by other
mods. Also saves change to config file.

Changed default Biome Ids to 126 and 127 which are just below a block
used by Minecraft.
2014-04-03 12:36:37 +10:30
fabricator77
e401a69782 Auto assign Biome Ids
Finds unused Biome IDs if the ones in the config are in use by other
mods. Also saves change to config file.
2014-04-03 06:12:10 +10:30
SpaceToad
4ea6f8959f fixed flood gate and finite liquids, close #1563 2014-04-02 09:00:51 +02:00
SpaceToad
e8eda47ec8 fixed iteration on filler 2014-04-02 08:46:08 +02:00
SpaceToad
374637639e new attempt at computing item speed 2014-04-02 07:57:27 +02:00
SpaceToad
635727942a fixed distance computation problem 2014-04-02 07:14:40 +02:00
fabricator77
2245e85773 Fix crash in BiomeInitializer when used in non standard WorldTypes
Fixes crash when BiomeInitializer runs in WorldTypes with less that three GenLayers. For example a world without river gen only has 2 Layers, the river is the 3rd.

Also remove redundant old code.
2014-04-02 10:02:59 +10:30
SpaceToad
6549ead866 initial progress for #1503 2014-04-01 09:02:30 +02:00
SpaceToad
9001521647 facorised animation code, close #1497 2014-03-31 23:20:45 +02:00
SpaceToad
d00dcf0314 fixed detection of finished build process 2014-03-30 21:10:26 +02:00
SpaceToad
f6e0d3a337 made progress with building animation, for #1497 2014-03-30 20:43:44 +02:00
SpaceToad
573ed26f60 made progress with builder animation, for #1497 2014-03-30 18:41:50 +02:00
SpaceToad
12138c4d53 added missing network synchronization, fix #1560 2014-03-30 14:02:08 +02:00
SpaceToad
546e8a0070 Merge branch 'BuildCraft-5.1.x' into NextGen 2014-03-30 13:10:25 +02:00
SpaceToad
ab75f0c623 added serializers for fluids 2014-03-30 11:50:39 +02:00
SpaceToad
c95d21255c fixed box around blueprints, for #1497 2014-03-30 00:03:09 +01:00
SpaceToad
23fb4cf295 empty pipes when reading contents, for #1536 2014-03-29 23:48:00 +01:00
SpaceToad
36baf7b108 fixed requirements for inventories, fix #1557 2014-03-29 21:50:17 +01:00
SpaceToad
967650a073 fixed blocks building too early 2014-03-29 18:41:45 +01:00
SpaceToad
d08d15d4c1 extracted array list serializer 2014-03-29 18:38:17 +01:00
SpaceToad
53b8f86db2 implemented generic schematic ordering, close #1528 2014-03-29 18:34:17 +01:00
SpaceToad
aa858467a1 removed OBE comment 2014-03-29 17:53:31 +01:00
SpaceToad
aea014b346 Minor adjustements and fixes in network system.
Not accepts @TileEntity and @RPC methods on private members.
Fixed inherited @MjBattery fields.
2014-03-29 17:51:08 +01:00
SpaceToad
e6f7fc7aa5 finalized initial set of blueprint options, close #1541 2014-03-29 16:57:51 +01:00
SpaceToad
307aeb2dfb start work on blueprint confirguration, for #1541 2014-03-29 16:32:38 +01:00
SpaceToad
b3b4a33af4 removed useless check 2014-03-29 16:28:06 +01:00
SpaceToad
3cf50c69f6 Merge branch 'patch-2' of https://github.com/anti344/BuildCraft into anti344-patch-2 2014-03-29 11:35:53 +01:00
SpaceToad
7b275c1455 fixed conflicts 2014-03-29 11:34:41 +01:00
SpaceToad
40a594ef23 fixed conflict 2014-03-29 11:33:01 +01:00
SpaceToad
df2d09e176 generalized previous change 2014-03-29 11:07:46 +01:00
SpaceToad
4191f69e14 Merge branch 'patch-1' of https://github.com/anti344/BuildCraft into anti344-patch-1 2014-03-29 11:01:23 +01:00
Anton
cb47a11853 Added IMC support for adding assembly and refinery recipes.
I think we shouldn't dismantle API adding, since if i do a complete addon it'll be easier to use, than IMC.

PS Is this just in NextGen buckets-machines behavior is broken? Or whole 1.7.2?
2014-03-24 22:08:02 +02:00
Anton
5333c1d389 Fix everything.
Without expected exceptions! =D
2014-03-23 00:15:29 +02:00
SpaceToad
7e4b40f254 added support for crops, fix #1539 2014-03-22 18:42:30 +01:00
SpaceToad
d4038e763c fixed engine schematics, fix #1538 2014-03-22 18:18:30 +01:00
SpaceToad
eb2f436f42 fixed handling of double doors, fix #1535 2014-03-22 18:07:38 +01:00
SpaceToad
75ddd6fb01 added missing support for painting, close #1517 2014-03-22 14:57:57 +01:00
SpaceToad
1af2a7ece5 Further progress for entity support, #1517. 2014-03-22 14:47:42 +01:00
SpaceToad
583d09d82e Making progress with entity support in blueprints, for #1517.
Some refactorings, in particular removal of the clone operations for blueprints,
not needed anymore now that blueprints are loaded on demand by builders.
2014-03-22 11:56:12 +01:00
Anton
5cf6d34fae I'm stupid, it was in cycle. 2014-03-21 20:35:05 +02:00
Anton
e0cabc07f7 Fix adding unaccessible fields, and their check.
Lol.
2014-03-21 00:11:44 +02:00
Anton
3115a6e94d Fix awesome MjBattery thing for Scala
Since Scala compiler makes all fields private and creates getters and setters for them, i check, if there is a public(so private Scala fields doesn't count) Scala setter and if is, then set proper accessibility for the field.
You can also find some info about that in comments in cpw.mods.fml.common.ILanguageAdapter.ScalaAdapter class.

Tested.
2014-03-19 22:41:14 +02:00
SpaceToad
7bee2a9717 Merge pull request #1470 from fabricator77/BuildCraft-5.0.x
Restore bucket handler so empty buckets fill correctly.
2014-03-19 18:19:03 +01:00
SpaceToad
ba2d66e81a fixed rotation for action direction 2014-03-19 15:36:48 +01:00
SpaceToad
8a150e9064 fixed shameful out of bound exceptions, fix #1522 2014-03-19 15:18:43 +01:00
SpaceToad
3919a9dae8 added protection against world corruption, for #1521 2014-03-19 15:12:58 +01:00
SpaceToad
a37441e324 finished migration of pipes to simple energy system, close #1532 2014-03-19 14:46:23 +01:00
SpaceToad
0230f8772d made progress in pipe migration to the simple energy framework (#1532).
removed some OBE classes
2014-03-19 14:14:37 +01:00
SpaceToad
43f0c5cf5c added support for rotating actions and triggers, close #1515 2014-03-19 11:59:40 +01:00
SpaceToad
2d3d70f6db Merge branch 'BuildCraft-5.1.x' into NextGen 2014-03-19 11:36:15 +01:00
SpaceToad
e34a4b25a4 Merge branch 'BuildCraft-5.0.x' into BuildCraft-5.1.x 2014-03-19 11:35:14 +01:00
SpaceToad
72742a24b1 added missing import and fixed format 2014-03-19 11:33:41 +01:00
SpaceToad
bf6f4621c5 fixed fluid behavior, close #1510 2014-03-19 11:24:46 +01:00
SpaceToad
8f3e836c7f implemented fire support in blueprints, close #1527 2014-03-19 11:09:30 +01:00
SpaceToad
92ef765f25 fixed spelling 2014-03-19 10:56:10 +01:00
SpaceToad
0ea21b9162 Finished implementation of stripes pipe (#1491 and #1512).
Started experiments migrating pipes to simpler energy framework (#1532)
2014-03-18 23:53:34 +01:00
SandGrainOne
8765dac0e3 Gates indicate that trigger require parameter
Also removing normal Inventory Triggers from FilteredBuffer, for now.
2014-03-18 23:00:04 +01:00
Anton
cb37886b22 Fix fluid icon 'compressing'. Another minor, that highly annoys me.
Used my universal method for any tank size.
It's opensource, after all, so that you can easily copy and use it xD
2014-03-18 23:47:06 +02:00
SpaceToad
4bf1d3cd49 implemented support for rail in blueprint, close #1516 2014-03-18 20:16:15 +01:00
SpaceToad
3c090c75f3 fixed default detection for tiles 2014-03-18 08:51:09 +01:00
SpaceToad
c08c1bc45a Changed instanceof BlockContainer to Block.hasEntity, close #1524. 2014-03-17 23:18:14 +01:00
SpaceToad
01323086cb added support for hopper in blueprints, for #1518 2014-03-17 21:22:18 +01:00
SpaceToad
e74fce7786 fixed blueprint support for redstone comparator, close #1519 2014-03-17 20:17:44 +01:00
SpaceToad
ef36d39b28 (hopefully) finished filler fixing, for #1513 2014-03-17 20:11:47 +01:00
SpaceToad
1a00a81731 further fixes in filler, for #1513 2014-03-17 08:59:09 +01:00
SpaceToad
664004a9d9 fixed NPE for #1513 2014-03-17 08:45:56 +01:00
SpaceToad
d28c9aa0a1 optimization for previous check-in 2014-03-16 21:17:38 +01:00
SpaceToad
3aeb961a31 Moved vanilla schematics in a non-API class
(this will allows fixes on minor versions).
Implemented portal support, for #1508.
2014-03-16 21:05:35 +01:00
SpaceToad
0edc3fbb09 further fixes in templates 2014-03-16 15:14:55 +01:00
SpaceToad
5f50418382 minor fixes 2014-03-16 14:15:00 +01:00
SpaceToad
73c2b3ec28 more progress on stripes pipe, for #1491 2014-03-16 13:46:08 +01:00
SpaceToad
39f2e2db9c Fixed buttons, close #1506. 2014-03-16 13:32:48 +01:00
SpaceToad
1ea19c2ae6 Fixed issues with requirements.
Inventories are now properly stored in blueprints, for #1507
2014-03-16 13:11:12 +01:00
SpaceToad
047882ef59 fixed basic stripe function, for #1491 2014-03-16 00:11:13 +01:00
SpaceToad
9827966140 merged with BuildCraft-5.1.x 2014-03-15 23:57:59 +01:00
SpaceToad
753dc868d2 Merge branch 'BuildCraft-5.0.x' into BuildCraft-5.1.x 2014-03-15 23:54:57 +01:00
SpaceToad
988156a290 fixed patch errors 2014-03-15 23:52:32 +01:00
Anton
120d041059 Prevent from getting broken pipe item 2014-03-16 00:44:39 +02:00
Anton
5eca225083 Resubmit for 5.0.x 2014-03-16 00:42:59 +02:00
AEnterprise
c40d3ce02c Finished the achievements
-Moved all achievements to the craftinghandler
-Added "Refine and redefine"
-Added "Tingly Laser"
2014-03-15 22:03:49 +01:00
SpaceToad
5822a0806a initial resurection of stripes pipe, for #1491 2014-03-15 21:20:42 +01:00
SpaceToad
63d4a5a055 fixed bug in path builder, close #1490 2014-03-15 17:37:33 +01:00
SpaceToad
31d95c9e4e further fixes for path builder, for #1490 2014-03-15 17:16:02 +01:00
SpaceToad
b4bd4c1e08 made progress in path marker implementation, for #1490 2014-03-15 16:59:47 +01:00
SpaceToad
f7c5c1cbae added protection against NPE 2014-03-15 14:30:01 +01:00
SpaceToad
3f2eb6fe4e further filler API simplifications 2014-03-15 13:05:48 +01:00
SpaceToad
19f44edebf finished migration of filler to new templates, close #1492 2014-03-15 12:53:59 +01:00
SpaceToad
60ecaec53a Improvements for adaptation of the filler to the new template system.
Custom Schematics can now be created not linked to a specific block
(e.g. SchematicMask). More filler patterns have been moved to the
new interface. For #1492.
2014-03-15 11:26:49 +01:00
AEnterprise
45d1458ae5 make it give the achievement to the player who places it down, not the one who is the closest 2014-03-13 20:26:50 +01:00
AEnterprise
dbc0fe42ad forgot a null check 2014-03-13 19:59:27 +01:00
AEnterprise
82de1ed0ed Make the previous achievements avalable
It didn't work to detect the crafting of the blocks so i changed it so that you get the achievement when you place the block in the world
2014-03-12 17:16:02 +01:00
AEnterprise
36cf4cbdde Added more achievements
-Added "Just hit it!"
-Added "A lot of crafting"
-Added "Straight down"
-Added "Chunk destroyeré
-Added "Faster filling"
-Added "Time for some logic"
2014-03-12 15:58:00 +01:00
AEnterprise
19d6bff276 Added first buildcraft achievements and achievement page :-)
-Added a craftingHandler
-Added "A bit rough around the edges"
-Added "Hard as a rock"
-Added "Is it stainless?"
-Added "No, it isn't made of honey"
-Added "Shiny!"
2014-03-12 14:10:46 +01:00
SpaceToad
86188e560e Initiated migration of filler to the new builder API (#1492)
Started experiments with simplified energy API (#1498)
2014-03-11 23:46:58 +01:00
SpaceToad
909b28a6df re-implemented template, close #1489 2014-03-10 23:33:36 +01:00
AEnterprise
518e411190 make quarry check for BlockLiquid 2014-03-10 17:43:12 +01:00
SpaceToad
1e02e58ffd fixed blueprint stairs support, close #1494 2014-03-10 08:57:40 +01:00
AEnterprise
7445ce797c fix quarry chasing water 2014-03-09 20:01:00 +01:00
SpaceToad
0173149db3 last minute fix... 2014-03-09 16:37:10 +01:00
SpaceToad
bda9d6b15c added protection against blueprint crash 2014-03-09 15:53:35 +01:00
SpaceToad
89acd880dc minor tweaks and fixes for server release 2014-03-09 15:34:01 +01:00
SpaceToad
1a2bc3a964 fixed server warning 2014-03-09 15:09:37 +01:00
SpaceToad
b615089a9b Merge branch 'BuildCraft-5.0.x' into NextGen
Conflicts:
	build.gradle
2014-03-09 14:54:36 +01:00
SpaceToad
a083857efc renamed BlueprintMangager into SchematicRegistry 2014-03-09 14:48:09 +01:00
SpaceToad
d8163eeca1 Cleanup, and started to migrate filler / quarry to the new bpt
close #1488
2014-03-09 14:29:15 +01:00
SpaceToad
f3e611bedd implemented missing library actions, fix #1482 2014-03-09 13:45:20 +01:00
SpaceToad
970425f9bf Implemented transfer of stacks requirements from client to server, close #1487 2014-03-09 13:15:23 +01:00
SpaceToad
0db2a98e05 Do not store full blueprints anymore, only ids. For #1484 2014-03-09 12:15:55 +01:00
SpaceToad
896dce5b65 reduced memory footprint of bpt requirements, #1484 2014-03-09 11:55:09 +01:00
SpaceToad
b775c045fc Introduced a layer specific for tile schematic, further optimizing for #1484 2014-03-09 11:07:17 +01:00
SpaceToad
add526d8f9 Optimized blueprint memory footprint, for #1484
Air block generate null schematics
x, y, z are not recorded in the schematic anymore
2014-03-09 10:48:55 +01:00
SpaceToad
d38ab99d89 further optimization for large blueprints handling 2014-03-08 20:33:36 +01:00
SpaceToad
854dab6c32 implemented RPC slicing and fixed handling, close #1477 2014-03-08 18:51:55 +01:00
CovertJaguar
ebcd3151bf Fix flowing lava matching 2014-03-08 09:40:24 -08:00
SpaceToad
aaecf6126a library is now passing directly byte arrays over the network, for #1477 2014-03-08 17:44:33 +01:00
SpaceToad
c8ebad37c3 fix performances issues when saving a blueprint from the architect, #1477 2014-03-08 17:13:58 +01:00
SpaceToad
8948339b15 implemented iterative reading of architect, for #1477 2014-03-08 16:23:08 +01:00
SpaceToad
46628683c1 fixed formatting, and use int to store NBT length, for #1477 2014-03-08 15:29:24 +01:00
SpaceToad
b2626a5cff added missing rotation for quartz pillar, #1481 2014-03-08 14:22:46 +01:00
SpaceToad
b925468e62 added rotations for logs, fix #1481 2014-03-08 11:56:02 +01:00
CovertJaguar
de38b80e6f Fix oil worldgen for stone-like blocks 2014-03-07 09:07:54 -08:00
SpaceToad
824396f989 added support for blueprints with no name, fix #1476 2014-03-06 08:55:47 +01:00
SpaceToad
cc4a0eb7db prepare experimental nextgen version 2014-03-05 20:51:37 +01:00
SpaceToad
707e048eb8 refactored class names and some schematic functions 2014-03-05 20:42:44 +01:00
SpaceToad
12e215c611 added back double meta specification 2014-03-05 08:59:14 +01:00
SpaceToad
15bb4eefe9 fixed diamond pipe recording 2014-03-04 22:16:09 +01:00
SpaceToad
83bc69303a now using NBT to pass blueprint over the network 2014-03-04 21:17:43 +01:00
SpaceToad
8a7b612402 migrated model of blueprint support, now slot-specific instead of block-type-specific 2014-03-04 21:03:37 +01:00
SpaceToad
ed0834c04e removed useless class 2014-03-03 23:41:13 +01:00
SpaceToad
955600e7ef fixed serialization of blueprint for the library 2014-03-03 20:49:35 +01:00
SpaceToad
46fe51803d fixed anonymous object serialization 2014-03-02 10:25:57 +01:00
SpaceToad
677b075a47 improved id translation, fixed pipe id translation 2014-03-01 19:58:22 +01:00
SpaceToad
39c9cd3391 ensure that ids on blueprints are not correlated to worlds ids 2014-03-01 18:12:37 +01:00
SpaceToad
4f8a4535b9 re-introduced last blueprint handlers 2014-03-01 17:35:32 +01:00
SpaceToad
db3638fa1c merged with BuildCraft-5.0.x 2014-03-01 10:45:42 +01:00
SpaceToad
8af4e59a6e improved file format, and reverted part of #1471 2014-03-01 10:33:26 +01:00
SpaceToad
43a696bb11 improved file format, and fix #1414 2014-03-01 10:29:35 +01:00
SpaceToad
ebb9857a7a made progress in pipe support for blueprints 2014-03-01 09:56:29 +01:00
Chris
f09da45e15 Merge pull request #1471 from dmillerw/BuildCraft-5.0.x
Fixed partially transparent facades rendering incorrectly
Fixes #1468
2014-02-27 15:57:48 -08:00
SpaceToad
3fba674ef8 Merge branch 'BuildCraft-5.0.x' into NextGen 2014-02-26 23:57:08 +01:00
SpaceToad
d2b058e0f7 fixed name and added protection against NPE, part of #1465 2014-02-26 23:56:54 +01:00
SpaceToad
a18f58f60c minor enhancements to pipe support in blueprints 2014-02-26 23:50:26 +01:00
dmillerw
438a6d906a Fixed indentation 2014-02-26 10:41:26 -08:00
dmillerw
07ce344751 Fixed indentation 2014-02-26 10:36:39 -08:00
dmillerw
9cb360af95 Fixed partially transparent facades rendering incorrectly 2014-02-26 10:33:17 -08:00
fabricator77
05693e1b0b Restore bucket handler so empty buckets fill correctly.
By default clicking on any fluid with an empty bucket will fill it with
water. BucketHandler matches the fluid block clicked on with the
matching fluid filled bucket (item)
2014-02-25 20:18:39 +10:30
Cisien
566760b270 Found some more valid facades! 2014-02-23 17:31:47 -08:00
Cisien
2443f52e16 Oh look! debug log text! <squish> 2014-02-23 16:18:31 -08:00
Cisien
b039726ef1 addFacade with an ItemStack of 0 would create a facade recipe without a block
fixed some spelling mistakes in build.grade
added IDEA project files to .gitignore
2014-02-23 15:24:49 -08:00
SpaceToad
ef2980ccc2 merged with builder branch 2014-02-23 23:28:15 +01:00
SpaceToad
681b3372f7 Merge branch 'BuildCraft-5.0.x' into builder 2014-02-23 23:25:30 +01:00
SpaceToad
830df9948f fixed id mapping computation 2014-02-23 23:16:28 +01:00
SpaceToad
d52acfa732 worked on old bpt files, and fixed requirements computation 2014-02-23 20:38:29 +01:00
SpaceToad
4ab0eaf290 last set of fixes for blueprints authoring 2014-02-23 17:36:47 +01:00
SpaceToad
5c5819f28d resurrected basic library functionalities 2014-02-23 17:14:11 +01:00
SpaceToad
d8c4d5db14 first implementation of save / load of blueprint on the disk 2014-02-23 15:33:28 +01:00
SpaceToad
8980dfdcdf reorganized class serialization, now accepts more objects 2014-02-23 11:59:30 +01:00
Cisien
fdd8800f2b Remove extra logging 2014-02-22 16:38:42 -08:00
Cisien
1c61f29259 Spaces 2014-02-22 16:20:25 -08:00
Cisien
5ebb0e4338 clean up some spaces tabs 2014-02-22 16:12:46 -08:00
Cisien
55ef362018 Better support for mod blocks in facades
Blocks can be blacklisted from becoming facades in the config
Added an IMC message for blacklisting facades. send an IMC message with the item stack, and the blacklist-facade command
Register FacadeRecipe with the RecipeSorter
Facades store the block registry block name in place of the ID. Existing facades will be updated automatically.
The add-facade IMC string message implementation now requires block registry name instead of id. (but still works with id, for now)
The FacadeRecipe handler will rotate through the meta of the blocks the facade is made from allowing cycling through variants (such as colors of wool).
2014-02-22 15:41:46 -08:00
SpaceToad
3dbf9b6495 re-established raw building capability 2014-02-22 13:54:47 +01:00
SpaceToad
51f0580374 initiated replacement of schematics with updated version of original Bpt code 2014-02-22 13:21:49 +01:00
SpaceToad
b4deff27bd progress in fixing back tile architect 2014-02-22 00:14:49 +01:00
SpaceToad
e55950dee6 started to resurect old blueprint system and simplified tiles with boxes 2014-02-21 21:30:12 +01:00
SpaceToad
a69d4a3df6 Merge pull request #1461 from Cisien/patch-4
Set the block name for lasers
2014-02-21 07:42:47 +01:00
Chris
e0f968eeb9 Set the block name for lasers 2014-02-20 21:45:36 -08:00
Chris
8d1a56f02e SideOnly on client only methods in gates
Problem: When loading a world that has gates, the server will crash with this exception:
http://paste.cisien.com/f/33730518.txt

Solution: add @SideOnly(Side.CLIENT) to the methods that deal with IIcon, since they are client-side only.

Tested item pipes with gates pulling items from a chest in single player, and in multi-player
2014-02-20 20:38:28 -08:00
SpaceToad
95cb00fe91 connected builder robots to filler urbanist 2014-02-20 21:26:54 +01:00
SpaceToad
880fc11c4f implemented synchronization of box kind 2014-02-20 09:31:33 +01:00
SpaceToad
aa65b484ac fixed villages generation, fix #1458 2014-02-20 08:47:24 +01:00
SpaceToad
84d3cd6948 fixed block urbanist rendering 2014-02-20 08:43:05 +01:00
SpaceToad
d27f8d90ab fixed serialization for urbanist over the network 2014-02-19 23:37:35 +01:00
SpaceToad
4b144864d6 avoid using entities when rendering frames 2014-02-19 22:43:29 +01:00
SpaceToad
b517ce2bf6 fixed (again) item facades, fix #1454 2014-02-19 08:27:53 +01:00
SpaceToad
bcd31a1f96 made progress in block selection from third person view 2014-02-19 00:23:06 +01:00
SpaceToad
2f1eb04d5d merged with builder 2014-02-18 21:22:58 +01:00
SpaceToad
85149631ad merged with 5.0.x branch 2014-02-18 21:20:29 +01:00
SpaceToad
873c39f314 added back some proxy code, fixing server load, fix #1447 2014-02-18 20:42:57 +01:00
SpaceToad
31f6516b79 Merge branch 'patch-2' of https://github.com/viliml/BuildCraft into viliml-patch-2 2014-02-17 21:32:49 +01:00
viliml
5facf915ba Fix Facade names
This is how to control name of items.
2014-02-17 16:27:11 +01:00
Robin
7a48cd63f3 fix format and use splitToList 2014-02-17 13:31:48 +01:00
SpaceToad
be5b87eb12 attempt at making facade computation more robust, fix #1444 2014-02-16 22:33:42 +01:00
SpaceToad
f943487150 added save / load for pickup robot 2014-02-16 22:29:46 +01:00
SpaceToad
3ccc60a119 finalized initial implementation of picker AI, and refactored a bit robots 2014-02-16 18:36:35 +01:00
SpaceToad
4948e02cb5 initial categorization of items 2014-02-16 17:21:22 +01:00
SpaceToad
1677fa3785 merged with latest changes and fix compilation errors 2014-02-16 12:14:30 +01:00
SpaceToad
347bfd7a2e Merge branch 'BuildCraft-5.0.x' into builder 2014-02-16 12:10:42 +01:00
SpaceToad
90f2532278 migrated to Minecraft 1.7 2014-02-16 12:10:01 +01:00
SpaceToad
ce393ec0ef fixed conversion error, fix #1439 2014-02-16 09:37:00 +01:00
SpaceToad
f5f192e7df removed all references to EntityClientPlayerMP and fixed filler packet, fix #1437 2014-02-16 09:29:26 +01:00
SpaceToad
5be1c3d066 changed biome ids in config, fix #1438 2014-02-16 09:19:11 +01:00
robin4002
754857dbb6 Move to assets lang system 2014-02-16 00:48:23 +01:00
SpaceToad
2709b8a1b7 fixed compilation errors with Minecraft 1.7 2014-02-15 22:29:48 +01:00
SpaceToad
ce432eaa76 further fixes in facades 2014-02-15 14:45:22 +01:00
SpaceToad
6b21bdd901 more fixes following last pull 2014-02-15 14:16:23 +01:00
SpaceToad
8a30d95286 Merge pull request #1433 from fabricator77/BuildCraft-5.0.x
Fix IIcon sided crashes on dedicated server
2014-02-15 14:06:26 +01:00
SpaceToad
88bb117094 added more gate options in creative 2014-02-15 09:57:27 +01:00
SpaceToad
360d782ea9 normalized file headers 2014-02-15 09:21:40 +01:00
fabricator77
d2a4dabdc7 Fix IIcon sided crashes on dedicated server 2014-02-15 14:09:48 +10:30
SpaceToad
b3dac23866 fixed generic fluid pumping 2014-02-14 08:53:53 +01:00
SpaceToad
ebbc8d2146 resurected minimum amount of blueprint for quarry frame 2014-02-11 22:46:50 +01:00
SpaceToad
3580d4b34a fixed quarry placement and various minors twearks 2014-02-11 21:11:06 +01:00
SpaceToad
12ec799ea3 fixed calls to sendNetworkUpdate 2014-02-11 08:23:55 +01:00
SpaceToad
9742bd6911 fixed location of icons/triggers to get proper icon load 2014-02-10 21:49:48 +01:00
SpaceToad
ef400b1d92 fixed missing packet ids transmission 2014-02-10 18:24:27 +01:00
SpaceToad
8f7f8d31ad fixed player in net handler and deprecated proxies 2014-02-10 18:06:44 +01:00
SpaceToad
f227dc2afc fixed items traveling in pipes 2014-02-10 16:05:05 +01:00
SpaceToad
f10e728b59 fixed pipe state synchronization 2014-02-10 15:16:32 +01:00
SpaceToad
944b9d693b fixed get description packets 2014-02-10 13:04:20 +01:00
SpaceToad
32e3d44e13 added missing channel to energy mod 2014-02-09 21:29:23 +01:00
SpaceToad
4d1e73f9e7 added discriminator for tile update 2014-02-09 21:19:35 +01:00
SpaceToad
976b6733da fixed setBlock calls to null 2014-02-09 19:55:54 +01:00
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