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

1900 commits

Author SHA1 Message Date
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