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

197 commits

Author SHA1 Message Date
asiekierka 53cfda589e refactor SchematicRegistry to ISchematicRegistry 2014-10-26 12:27:51 +01:00
asiekierka 95f13ba439 remove modsSupported, redundant Architect Table options, etc... strive for a proper builder supporting system 2014-10-26 10:30:34 +01:00
asiekierka 4ac490a581 fix style 2014-10-24 16:34:15 +02:00
asiekierka 6085945d9a remove science book/technology code, close #2088 2014-10-24 10:32:10 +02:00
SpaceToad b906f7b7a8 attempt at moving MJ => RF units, for #2015 2014-09-14 12:30:04 +02:00
SpaceToad a703d946b1 Merge branch 'iron-engine' of github.com:Prototik/BuildCraft into Prototik-iron-engine 
Conflicts:
	common/buildcraft/energy/TileEngineIron.java
 2014-09-06 12:28:50 +02:00
asiekierka cba7b0ba18 Port over everything but pipes. 2014-09-03 19:22:15 +02:00
asiekierka ab84e095cd start removing the "new" MJ API, commit RedBuildCraft engine implementation 2014-09-03 11:21:08 +02:00
Prototik ae184f76b2 Rewrite fuel/coolant api for iron engine 
Add lava as fuel source
 2014-08-29 19:08:34 +08:00
Parker 37adec2afe Updated logging to log4j2 2014-08-02 11:33:58 -04:00
SpaceToad 4a1bc66d63 made progress with addition to research tree, for #1951 2014-07-28 23:51:50 +02:00
SpaceToad 48d95b1e26 made progress with research book, for #1951 2014-07-27 23:05:35 +02:00
SpaceToad d10c570466 start work on science book 2014-07-25 08:40:47 +02:00
SpaceToad 04bce9dc5c initial experiments with map planning block 2014-07-19 21:27:50 +02:00
SpaceToad 9d4465bbc5 Merge branch '6.0.x' into 6.1.x 2014-07-11 22:26:44 +02:00
SpaceToad ab4114dbe6 Merge branch '5.0.x' into 6.0.x 
Conflicts:
	common/buildcraft/BuildCraftEnergy.java
 2014-07-11 22:26:29 +02:00
Andrew Dudney f9e9c6cb26 Changed build.gradle to use RunDir, changed deprecated fluid localized name functionality, changed deprecated biome type desert to sandy. 2014-07-11 14:12:02 -06:00
Raul Tambre 5292bc6f19 Even more parameterization and cleanup 2014-06-15 22:05:06 +03:00
SpaceToad b1076d8556 fixed API builds 2014-06-13 13:36:02 +02:00
SpaceToad 81bc0fe11b finalized recipe refactoring, close #1861 2014-06-06 09:00:11 +02:00
SpaceToad cfb9095139 Initial refactoring of recipe mechanics. 
Assembly table should be ok, integration table and refinery still to go.
For #1851
 2014-06-02 16:29:13 +02:00
Raul Tambre 742391e504 Fix oil and fuel opacity 2014-06-01 10:48:31 +03:00
SpaceToad 6150c5b09e Merge branch '6.0.x' into 6.1.x 2014-05-31 18:09:33 +02:00
SpaceToad 8bff372360 Merge branch '5.0.x' into 6.0.x 
Conflicts:
	common/buildcraft/BuildCraftBuilders.java
	common/buildcraft/BuildCraftCore.java
	common/buildcraft/BuildCraftEnergy.java
	common/buildcraft/BuildCraftFactory.java
	common/buildcraft/BuildCraftSilicon.java
	common/buildcraft/BuildCraftTransport.java
	common/buildcraft/builders/network/PacketHandlerBuilders.java
	common/buildcraft/core/network/PacketHandler.java
	common/buildcraft/core/network/PacketTileState.java
	common/buildcraft/factory/network/PacketHandlerFactory.java
	common/buildcraft/silicon/network/PacketHandlerSilicon.java
	common/buildcraft/transport/network/PacketHandlerTransport.java
 2014-05-31 18:09:23 +02:00
SpaceToad d946f8d936 tentative fix for packet leaks, #1855 2014-05-31 15:26:43 +02:00
SpaceToad 515060fff3 Merge branch '6.0.x' into 6.1.x 2014-05-09 18:18:23 +02:00
SpaceToad f91b9033fa Whitelisted to Applied Energetics spacial API all blocks that don't rely on 
absolute positions.
Close #1753
 2014-05-08 21:57:05 +02:00
SpaceToad 83b526592d Reactivated robots, for #1732. 2014-05-07 19:48:39 +02:00
SpaceToad cf54f0e68a improved biome setting for oil generation 2014-05-05 12:55:40 +02:00
Prototik aa68c3cd81 Add MjAPILegacy for providing an old-style api for the new power api. 
Add Energy Converter block for the same things in game.
 2014-05-05 16:21:25 +08:00
SpaceToad 7b77008d97 Updated coding standard, and enforce it in the entire BuildCraft codebase. 
Close #1662.
 2014-05-03 18:59:52 +02:00
Prototik cb69f11cf9 Split creative tabs by blocks, items and pipes 2014-05-03 10:25:14 +08:00
SpaceToad 1551d7c129 Implemented control in the architect, as not to read non-explicitely supported 
blocks.
Implemented blacklist for mods and blocks in builder.
Close #1594.
 2014-05-01 16:42:58 +02:00
SpaceToad 7f3978cc18 fixed compilation error and minor formating 2014-04-28 20:58:20 +02:00
SpaceToad 3411d023a5 Merge branch 'BuildCraft-5.1.x' into NextGen 2014-04-28 20:05:39 +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
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 da36db0a0c fixed localisation of highlight handler 2014-04-10 22:23:25 +02:00
SpaceToad 871638ddda fixed missing import 2014-04-09 08:54:28 +02:00
Anton 7b888559b8 Register BlockHighlightHandler class 2014-04-06 16:57:34 +03:00
SpaceToad eb6293b0fe Merge branch 'BuildCraft-5.1.x' into NextGen 2014-04-05 15:15:53 +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
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 7b275c1455 fixed conflicts 2014-03-29 11:34:41 +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
SpaceToad a083857efc renamed BlueprintMangager into SchematicRegistry 2014-03-09 14:48:09 +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 8a7b612402 migrated model of blueprint support, now slot-specific instead of block-type-specific 2014-03-04 21:03:37 +01:00
SpaceToad 4f8a4535b9 re-introduced last blueprint handlers 2014-03-01 17:35:32 +01: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
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 90f2532278 migrated to Minecraft 1.7 2014-02-16 12:10:01 +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 360d782ea9 normalized file headers 2014-02-15 09:21:40 +01:00
SpaceToad 3580d4b34a fixed quarry placement and various minors twearks 2014-02-11 21:11:06 +01:00
SpaceToad 32e3d44e13 added missing channel to energy mod 2014-02-09 21:29:23 +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 12cb51373e various experiments for BC NextGen 2014-02-01 17:19:07 +01:00
SpaceToad 14003341e3 progress made in MC 1.7 network support 2014-01-13 20:26:16 +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 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
CovertJaguar 5150d01672 Add Redstone Fader Exp + major cleanup 2013-12-27 08:40:44 -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 cc0298ce5b Clean up Recipe API 2013-12-01 21:57:31 -08:00
CovertJaguar 7ee48c9cbd Fix Fluid Localization 2013-11-20 20:32:11 -08:00
CovertJaguar 696c206792 Register all items with FML so they survive 1.7 2013-11-13 17:23:41 -08: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
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
Gordon H 4a017f355e Added oil well generation probability scalar to config file 2013-09-22 09:48:25 -04:00
ddoggy99 5e786d8902 Cleaned up IMC code 2013-09-12 23:27:11 +10: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 8a12218085 Set fluid flowing icons properly 2013-08-16 02:27:50 -07:00
viliml 321d8d1f2b Update BuildCraftEnergy.java 
Fixes https://github.com/BuildCraft/BuildCraft/issues/1091.
 2013-08-04 22:23:23 +02: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 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
CovertJaguar 39855eed65 Add Fluid drip particles 2013-07-18 22:19:23 -07: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
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 33422087a3 Clean up Iron Engine APIs 2013-07-14 12:09:54 -07:00
CovertJaguar 425515504d Make Oil burn again 2013-07-12 17:10:52 -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
Christian 103a8c124b First draft 1.6. Lots still to do. :( 2013-07-07 22:57:05 -04:00
CovertJaguar 670c2684e7 Fix Iron Engine heat issues 2013-06-30 17:52:57 -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
CovertJaguar 77b92a8ce9 Added Oil Burn config 2013-06-13 13:50:51 -07:00
CovertJaguar bbc5881fd0 More Oil gen rebalancing 
Reduced the chances of spawning wells.
 2013-06-11 14:54:15 -07:00