Commit graph

450 commits

Author SHA1 Message Date
Blood-Asp
ba030d3239 Merge pull request #1060 from JohannesGaessler/MaterialFormulaFix
Material formula fix
2017-05-31 18:57:05 +02:00
Blood-Asp
c28a8ceb78 Catch broken items on recipe move 2017-05-31 18:10:11 +02:00
Johannes Gäßler
56bb017df6 Implemented SBR recipes, Added method for LCM recipes, adjusted
polymerization

Polymerization now requires Titaniumtetrachloride instead of Titanium
Dust; Can only be performed in a LCM.

Adjusted the visual representation of LCM recipes in NEI
2017-05-30 02:10:13 +02:00
Johannes Gäßler
407c77fd31 Added Materials for Polystyrene, SBR, implemented Polystyrene recipes 2017-05-29 14:24:52 +02:00
Johannes Gäßler
98ade12e9c Added recipes for the synthetic production of rubber from hydrocarbons 2017-05-29 12:29:16 +02:00
Johannes Gäßler
3a01667534 Added Recipes for Tetranitromethane, made it the additive for NitroFuel
Moved the old NitroFuel recipes to simplified recipes.

Added a new Material for Diluted Sulfuric Acid.

Adjusted the fuel value of Ethanol: 128 -> 168.

Adjusted the recipes for Capacitors; Particularly you can now use PVC
instead of silicone.
2017-05-29 10:52:51 +02:00
Johannes Gäßler
c38cc2bc7b Changed the Distillation Tower so that it outputs fluids only at the
correct levels.

Adjusted existing distillation recipes so that they line up with this
change.
Slightly rebalanced Charcoal Byproducts.
2017-05-29 00:09:38 +02:00
Johannes Gäßler
3d83a381d6 Added recipes for distilling cracked hydrocarbons, adjusted fuel values
Made it so that all Hydrocarbons have a fuel value of 24000 * C + 20000
* H.
Oxygen for alcohols is ignored.

In particular:
Hydrogen: 15000 -> 20000
Methane: 45000 -> 104000

LPG production no longer yields Methane.
LPG is now produced from Propane or Butane.
Super Fuel from LPG is now a simplified recipe.
Methane from centrifuging food is now a simplified recipe.
2017-05-28 19:30:02 +02:00
Johannes Gäßler
407c7e3ac3 Fixed IC2 steam compatibility for cracking 2017-05-25 23:52:33 +02:00
Johannes Gäßler
4c02055503 Rewrote parts of the Oil Cracker so that it's in line with the new
recipes
2017-05-25 18:34:00 +02:00
Johannes Gäßler
66c957a21e Removed debugging print accidentally left in from the previous version 2017-05-25 00:41:17 +02:00
Johannes Gäßler
b27566a70a Expanded Materials class for cracked Fluids, changed cracking recipes
Fluid cracking can be done with either Steam or Hydrogen and at 3
different severities for a total of six different recipes.
Cracking severity is controlled with a programmed circuit.

Removed the previously used liquids for cracked light fuel/heavy fuel

Changed the Distillation Tower recipes so they can utilize up to 11
fluid outputs
2017-05-24 23:59:42 +02:00
Johannes Gäßler
32db407391 Removed debugging prints accidentally left in the previous commit 2017-05-18 19:27:53 +02:00
Johannes Gäßler
d805ce4613 Fixed MaterialStack String representations sometimes missing brackets 2017-05-18 19:22:06 +02:00
Johannes Gäßler
856f1bebbf Changed the NEI GUI of the Distillation Tower to show up to 12 outputs.
Also added a currently unused GUI for 9x9 recipes.
2017-05-16 22:19:36 +02:00
Yuriy Shnitkovskiy
bc7eaaa762 Added config for automation 2017-05-16 19:49:46 +03:00
Yura
4e3ed071dc Auto Maintenance Hatch tweaks
Fixed #958 and #1053, allowed robots\pipes to interact with it.
2017-05-16 16:17:01 +03:00
Johannes Gäßler
359e7e5905 Added Materials for Hydrocarbon chains of up to 4 carbon atoms. 2017-05-14 19:34:14 +02:00
Johannes Gäßler
17edbc2d48 Fixed a bug that caused there to be two identical recipes for TiF4 2017-05-13 17:51:51 +02:00
Johannes Gäßler
60348c09ba Added a new recipe map for the LCR, expanded the API to allow for custom
NEI stack positioning.

Refactored the name of the Large Boiler Fake Fuels so they're in line
with other names.
Fixed a bug where the LCM was checking for the wrong casing type.
2017-05-13 16:37:39 +02:00
Johannes Gäßler
20142f1b10 Merge branch 'ChemistryUpdate' into LargeChemicalReactor
Conflicts:
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-05-12 21:12:01 +02:00
Johannes Gäßler
0c2dee56da Added new textures for the LCM, using them now 2017-05-09 21:51:49 +02:00
Johannes Gäßler
7bc06a3969 Implemented checkMachine for the LCR, added machine casings 2017-05-08 00:11:36 +02:00
Johannes Gäßler
0aeab34a56 Fixed the Electric Blast Furnace not recognizing recipes when there is
more than one Fluid input.

Also added a String representation for GT_FluidStack that was used for
debugging.
2017-05-06 18:01:06 +02:00
Johannes Gäßler
5e43252e8a Added a graphic for acids, made the javadoc more descriptive 2017-05-04 22:04:04 +02:00
Johannes Gäßler
f625a93e46 Materials for existing fluids, ash nerf, plastic production svg 2017-05-02 21:06:35 +02:00
Johannes Gäßler
978c4877b6 Added molecular formulas for the new materials, added alternative
charcoal recipes.

Charcoal can now be made by treating Wood Pulp or Sugar with Sulfuric
Acid (takes very long, doesn't scale well)
2017-05-01 22:02:36 +02:00
Johannes Gäßler
2a8bc79bb5 Added recipes for centrifuging Stone Dust
The amount of elements you get from centrifuging is proportional to
their mass percentage in the earths continental crust with a tolerance
of ~5-20%
2017-05-01 12:42:21 +02:00
Johannes Gäßler
09c76543b2 methods for pipe creation, new plastic pipes, implemented PVC
Added a new plastic: Polyvinyl Chloride, currently only used for item
pipes

Added Polytetrafluoroethylene Fluid Pipes

Fixed the number of fluid cells for polymerization, Fixed the default
alpha value for the MaterialBuilder class
2017-05-01 00:47:19 +02:00
Johannes Gäßler
1f83a98876 New recipes, convenience methods, recipe rebalancings
Implemented new recipes for Gunpowder, Saltpeter, Sulfuric Acid 
Gave Sulfur dust a burn value (1600, the same as coal)
Made all chemical recipes stoichiometrically correct whenever possible
(2 H + 1 O -> 1 H2O instead of 2 H + 1 O -> 3 H2O)
Added a convenience method to Materials that lets you get dust
succinctly
Put all simplified recipe additions in a separate method, the config is
still missing
2017-04-30 18:04:25 +02:00
Johannes Gäßler
8ac41d3c3c Chem reactors can now output 2 items, implemented recipes for Nitric
Acid,added utility methods to get Material cells or integrated circuits,
it's now possible to declare a temperature for automatically created
fluids / gases
2017-04-30 01:36:10 +02:00
Johannes Gäßler
17bf0dd960 Fixed a sneaky and game-breaking bug that caused quite a lot of fluids
to no longer have recipes for filling cells.

The reason for the bug was that the bit flag 256 is already in use to
designate something as empty.
Since only bit flags up to 128 were documented I had unwittingly used
the 256 bit flag for fluid creation.
The documentation now informs about the function of 256.
Automatic fluid and gas creation are now controlled via booleans.

Big thanks to Techlone for helping me debug.
2017-04-29 17:23:19 +02:00
Johannes Gäßler
bf414f1c99 Implemented Nitric Acid, Rocket Fuel 2017-04-28 23:34:39 +02:00
Techlone
cff6b44a84 Formatting clean up, nothing else 2017-04-27 16:32:27 +05:00
Johannes Gäßler
eb45688648 Fixed a bug where excess fuel didn't consider the distortion from
runtimeBoost.

Adjusted the decimal points of the Large Boiler fuel tab to better
represent the actual burn times.
2017-04-27 00:28:07 +02:00
Johannes Gäßler
baa9caf06b Eliminated rounding errors that caused fuel to burn too shortly
The Large Boiler now saves excess fuel between items, greatly improves
performance of items like sticks and planks.
The Large boiler now stores excess projected EU that is lost when
throttling with an integrated circuit
2017-04-26 23:57:10 +02:00
Johannes Gäßler
8f4225f0b8 Refactored mDescription to mDescriptionArray, added a deprecated field
mDescription to ensure 100% backwards compatibility
2017-04-26 20:37:47 +02:00
Johannes Gäßler
878738a75c Corrected the Maintenance Hatch tooltip 2017-04-24 23:55:42 +02:00
Johannes Gäßler
1c75968fad Fixed the GTLog spam, ty Techlone 2017-04-24 23:40:24 +02:00
Johannes Gäßler
610a064576 Expanded Charcoal Byproducts, added recipes that produce them 2017-04-24 23:07:26 +02:00
Johannes Gäßler
c2c9fad120 Fixed a bug that caused Battery Buffers to not have a tooltip 2017-04-24 20:50:08 +02:00
Johannes Gäßler
2674563827 Made the centrifuge recipes for ash more realistic 2017-04-24 20:33:33 +02:00
Johannes Gäßler
b5e0a5221c Tweaked Titanium, implemented Silicone and Gunpowder
Carbon Monoxide can now be obtained as an optional byproduct from
Titaniumtetrachloride production.

Added a missing chemical reactor recipe for Gunpowder
2017-04-23 18:36:21 +02:00
Johannes Gäßler
1d93f77414 Added additional recipes for acids and bases 2017-04-23 10:03:38 +02:00
Johannes Gäßler
37eea39e29 Enabled solid output for Distilleries, implemented Epoxy Resin / PTFE
production

Expanded the GregTech API: There is now a convenience method for
automatically creating polymerization recipes.

Disabled recipes for the Salty Water Potion in favor of a new Salt Water
fluid.
Slightly nerfed Sulfuric Acid production from Sulfur and Water to make
them align with other acids and bases (1 Dust / 1000L Chemical + 1000L
Water -> 1000L acid/base)
2017-04-22 19:08:47 +02:00
Johannes Gäßler
c6326a337c Added recipes for Epichlorohydrin 2017-04-21 00:01:22 +02:00
Johannes Gäßler
72c55d5726 Refactored MaterialAdapter to MaterialBuilder to better represent the
class functionality.
2017-04-20 09:28:26 +02:00
Johannes Gäßler
9906c39720 Fixed a typo, Added a missing glue recipe 2017-04-20 00:29:26 +02:00
Johannes Gäßler
869cad0bba Added a lot of (petro)chemistry stuff, expanded the API
Created an adapter class for creating materials.
Materials now have bit flags for automatic gas/fluid creation.
Added a new convenience method for adding distillery recipes.
Recipes now show the exact recipe duration instead of the duration
rounded down to the nearest int.

Added new Materials with relevant recipes:
Acetic Acid, Acetone, Calcium Acetate, Charcoal Byproducts, Carbon
Monoxide, Ethanol, Ethylene, Methanol, Methyl Acetate, Polyvinyl
Acetate, Propene, Sulfuric Ethylene, Vinyl Acetate

Made vinegar visible.
2017-04-19 23:36:50 +02:00
Johannes Gäßler
d79721085e Tooltips have more info on Steam and pollution, adjusted pollution rates
Boilers tooltips now explicitly state the amount of Steam produced per
second.
Gas Turbine tooltips now explicitly state how much steam is needed for
them to run at full capacity.

Machine tooltips now explicitly state how much Pollution they produce
per second.
Adjusted machine pollution values to have them align better.
Diesel Generators / Engines now go 40, 80, 160, 320
Gas Turbines now go 20, 40, 80, 160

Large Boiler tooltips now mention the amount of time needed to heat up

Formatted the source code for the Cleanroom

Fixed a bug that caused Diesel Generators and Gas Turbines to not have a
tooltip.
2017-04-15 19:05:57 +02:00