Commit graph

928 commits

Author SHA1 Message Date
Blood-Asp
b418fede09 Change Automaintain default 2017-05-31 18:59:32 +02:00
Blood-Asp
5386a69022 Merge pull request #1051 from JohannesGaessler/unstable
[5.09.29] EBF recipe fix followup
2017-05-31 18:58:06 +02:00
Blood-Asp
3f73fa9b86 Merge pull request #1058 from Georggi/patch-4
Auto Maintenance Hatch tweaks
2017-05-31 18:57:39 +02:00
Blood-Asp
ba030d3239 Merge pull request #1060 from JohannesGaessler/MaterialFormulaFix
Material formula fix
2017-05-31 18:57:05 +02:00
Blood-Asp
b170cd5a5c Merge pull request #1067 from antifluxfield/unstable
Wrong behavior of Player Detector
2017-05-31 18:55:35 +02:00
Blood-Asp
1af33411d2 Disable switching armor gui because of broken sync 2017-05-31 18:53:56 +02:00
Blood-Asp
c28a8ceb78 Catch broken items on recipe move 2017-05-31 18:10:11 +02:00
Blood-Asp
40304ed2f5 Catch login armor crash 2017-05-31 18:09:30 +02:00
Johannes Gäßler
038e51535b Fixed a bug where the Chemical Reactor still only had one output slot in
it's machine inventory, causing the second output to be voided.
2017-05-30 17:00:31 +02:00
Johannes Gäßler
38bfbabd58 Fixed a bug where the LCM could have a mMaxProgressTime of zero. 2017-05-30 10:21:46 +02:00
antifluxfield
c42c2facb1 Update GT_Cover_PlayerDetector.java 2017-05-27 14:48:39 +08:00
antifluxfield
aa4839ebf6 Update GT_Cover_PlayerDetector.java 2017-05-27 14:46:03 +08:00
Johannes Gäßler
e304e8f9de Fixed stocheometrically incorrect Chloroform recipe. 2017-05-25 01:06:48 +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
Yuriy Shnitkovskiy
c0f8bafc60 I guess I wanted to put it here for some reason 2017-05-16 19:52:04 +03: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
724f9a4e09 Moved the Biomass -> Ethanol recipes to the simplified chemical recipes. 2017-05-16 00:18:03 +02:00
Johannes Gäßler
8823dc53f8 Added a GUI for the Large Chemical Reactor 2017-05-15 21:08:27 +02:00
Johannes Gäßler
921cff51d8 Bugfix: I had accidentally copied the IC2 Biogas recipes instead of
moving them.
2017-05-14 18:51:58 +02:00
Johannes Gäßler
d77592f68d Moved old IC2 Biogas recipes to the simplified recipes. 2017-05-14 18:49:08 +02:00
Johannes Gäßler
25ff27a2a2 Merge branch 'LargeChemicalReactor' into ChemistryUpdate 2017-05-13 23:40:08 +02:00
Johannes Gäßler
c0152219c5 Corrected several chlorination recipes in terms of stoichiometrics 2017-05-13 23:35:25 +02:00
Johannes Gäßler
a16ea6bbc7 Changed the Layout of the LCM to 3x3x3, tweaked the name of casings and
the descriptions of multiblocks to make them consistent.
2017-05-13 23:08:50 +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
3cf169b5c3 Added crafting recipes for the LCH 2017-05-12 22:50:29 +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
3b681b69d5 Changed multiblocks so they all consider all inputs for finding recipes 2017-05-10 19:56:36 +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
ad40b85de1 Implemented checkRecipe 2017-05-09 18:25:24 +02:00
Johannes Gäßler
60cea028a4 Reverted an erroneous name change for nitration mixture 2017-05-08 20:37:20 +02:00
Johannes Gäßler
989f2f2356 Deleted prints used for debugging 2017-05-08 00:12:23 +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
4546f45e3a Created a non-functional first draft for the Large chemical Reactor 2017-05-07 15:36:01 +02:00
Johannes Gäßler
b1e35de06e Reverted erroneous previous commit. 2017-05-07 08:47:24 +02:00
Johannes Gäßler
dc217f66a8 Created a first draft for the Large Chemical Reactor 2017-05-06 21:23:32 +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
0364c3e708 Small tweak to Rocket Fuel to ensure that production cost > burn value 2017-05-04 22:56:43 +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
26dd5c2af3 Added an svg for misc chemical recipes, tweaked several recipes 2017-05-03 23:38:22 +02:00
Johannes Gäßler
b5e894beeb Added distillation recipe for Phenol, tweaked the graphic for plastics 2017-05-03 00:04:35 +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
a0bf545451 Added config for simple chemical recipes and stone dust centifugation 2017-05-01 14:36:50 +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
ac49979979 Changed the newly added recipes so that they use the new API 2017-04-30 18:41:42 +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
Blood-Asp
e7d8d5ecbe Merge pull request #1025 from JohannesGaessler/SteamProductionImprovement
Steam production improvement / Tooltip improvement / Pollution adjustment
2017-04-27 18:26:42 +02:00
Techlone
cae69aa28f Fix eu consumption absence by AssemblyLine and some clean up 2017-04-27 19:35:07 +05: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
2ca81b2828 Changed the wording on heating capacity to make the effects more clear. 2017-04-23 10:45:07 +02:00
Johannes Gäßler
f1ab33d996 Added information on how Heat Capacity surplus influences recipe time 2017-04-23 10:39:25 +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
Techlone
e24cd9e732 fix #1029 2017-04-22 16:10:21 +05: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
9af7f8cc67 Made Diesel Engine Tooltip more descriptive 2017-04-16 10:33:36 +02:00
Johannes Gäßler
162d021fc8 Tooltip information on pollution is now dynamic, adjusted GT_Pollution
documentation
2017-04-15 19:39:34 +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
Johannes Gäßler
234c51ac20 Machine descriptions are now a String array instead of a single String.
The field mDescription of the class GT_MetaTileEntity_TieredMachineBlock
was turned into an array.
Every class derived from GT_MetaTileEntity_TieredMachineBlock has
received a new additional constructor that takes an array of Strings
instead of a single one.
2017-04-14 23:33:20 +02:00
Johannes Gäßler
213d5bb9df Large Boiler fuel burn rate now configurable
By placing an integrated circuit in the Large Boiler it is now possible
to adjust fuel burn rate and steam output at no change in efficiency.
The steam output of a boiler is reduced by 1000L per configuration.
2017-04-14 20:03:29 +02:00
Johannes Gäßler
7044deb43b Added a recipe for Thaumcraft Alumentum and some other items
Iterating over items and checking for fuel values turned out to not give
good results because it ignores the Ore Dictionary.
For instance there would be a page for only oak logs instead of a page
with wood in general.
2017-04-13 23:21:35 +02:00
Johannes Gäßler
2064e0b12c Explicitly added some Solid Fuels to the Large Boiler Fuel tab.
I was unable to automatically add all fuels to the tab.
2017-04-11 00:47:56 +02:00
Johannes Gäßler
822cf1ec3e Expanded the NEI api to allow for custom descriptions, added liquid
fuels to the newly created Large Boiler tab

Instead of the default information like total EU or EU usage it is now
possible to provide custom Strings to describe a recipe.

The Large Boiler NEI tab explicitly shows burn times for fuels depending
on the boiler used.
Any liquid fuel added to Diesel Fuels or Semifluid Fuels will
automatically be added to Large Boiler Fuels.
2017-04-10 20:57:44 +02:00
Blood-Asp
ee5af6ac40 Fixing names for plastics 2017-04-10 13:07:13 +02:00
Blood-Asp
706d2e4bd5 All foils can be made in bender. 2017-04-10 12:54:11 +02:00
Blood-Asp
13043923c0 Fix compile issue 2017-04-10 12:47:50 +02:00
Archengius
8081ba10df Remove deprecated api.. 2017-04-03 16:37:25 +07:00
Blood-Asp
454b255f1b Fix regulator crash bug 2017-04-01 12:26:47 +02:00
Blood-Asp
f94ae649be Move some recipes since max java method size was reached 2017-04-01 01:25:30 +02:00
Blood-Asp
6f5e16b286 Updated Achievements to fit changed circuits 2017-04-01 01:03:52 +02:00
Blood-Asp
998709430c Fix typo 2017-03-31 22:37:51 +02:00
Blood-Asp
7beabd163a catch most modular armor crashes 2017-03-31 22:24:36 +02:00
Blood-Asp
d41d3cd2b3 Add assemblyrecipes for all circuits per oredict 2017-03-31 22:24:15 +02:00
Blood-Asp
b5626433b9 Better logging for oregen 2017-03-31 21:27:50 +02:00
Blood-Asp
f030951982 Config for blocks below crops 2017-03-31 21:19:04 +02:00
Blood-Asp
32a21a0ac1 Remove testline 2017-03-31 19:02:45 +02:00
Blood-Asp
dd8510792f Detect low grav dimensions by world provider 2017-03-31 19:01:32 +02:00
Blood-Asp
944f1dab7e Missed a file 2017-03-31 17:38:48 +02:00
Blood-Asp
4fc431e77e Add Lightning Rod 2017-03-31 17:38:29 +02:00
Blood-Asp
d725c463e5 null check to prevent bukkit crash 2017-03-31 16:14:36 +02:00
Blood-Asp
1cf68bbcdf Naquadah gen tiers 2017-03-26 21:38:39 +02:00
Blood-Asp
5771ee4e55 Merge pull request #987 from Sirse/unstable
Fix NEI NoClassDefFoundError
2017-03-26 21:17:01 +02:00
Blood-Asp
024a5adab1 Merge pull request #981 from dohyun22/patch-1
Fixed various Bugs on the Powderbarrel.
2017-03-26 21:16:22 +02:00
Dimach
324a4cc312 Cleanup code. 2017-03-26 21:00:17 +03:00
Dimach
3654c51469 Fix #982, #986. 2017-03-26 20:58:16 +03:00
Sirse
c3f9137218 Fix NEI NoClassDefFoundError
Ensure is NEI loaded before call their API methods
2017-03-27 00:02:13 +07:00
dohyun22
15db129b1d simplified the code. 2017-03-25 18:53:21 +09:00
dohyun22
945a13d4ae Fixed various Bugs on the Powderbarrel.
Fixed PrimedTNT Entity being spawned on client side when destroyed by player.
Fixed PrimedTNT Entity spawning at misplaced location (about 0.5m from the center of the block).
Fixed fuse sound not being played when ignited.
Fixed Powderbarrel not being able to spawn PrimedTNT Entity when destroyed by explosion.
2017-03-24 12:24:02 +09:00
Blood-Asp
445e548b4c Allow teleportation to galacticraft dimensions 2017-03-23 21:16:32 +01:00
Blood-Asp
5a7e797883 Reduce Plascrete Mininglevel and hardness/resistance 2017-03-23 20:34:54 +01:00
Blood-Asp
714f3c19fa Add powerconfigs to Teleporter 2017-03-23 13:59:16 +01:00
Blood-Asp
896ee56a08 Fix ItemDetector Cover not detecting slot 0 2017-03-23 13:59:16 +01:00
Blood-Asp
5f56c40a75 Prevent empty batterys from stacking in battery buffer 2017-03-23 13:59:16 +01:00
Blood-Asp
7c67f95c93 Small fusion reactor fixes 2017-03-23 13:59:16 +01:00
Blood-Asp
9c91a6cea2 Overclock high amp machines correctly in Processing Array 2017-03-23 13:59:16 +01:00
Blood-Asp
3e3a08af9a Fix AssemblyLine block check 2017-03-23 13:59:16 +01:00
Blood-Asp
de18b83e85 TryCatch broken IC2 recipes 2017-03-23 13:59:16 +01:00
Blood-Asp
1443cb6141 Alternative superbuffer recipe with datasticks 2017-03-23 13:59:16 +01:00
MauveCloud
57ccbfc0c6 Allow dimensions added by other mods (besides GalactiCraft) to inherit GT worldgen features from overworld 2017-03-22 13:23:42 -07:00
MauveCloud
48461498f1 Fix for #726
Hopefully this will also fix #878.
2017-03-22 12:54:37 -07:00
Blood-Asp
6582650cf4 Fix spelling of wafers 2017-03-22 19:09:25 +01:00
Blood-Asp
d5a9a7c03e Fix missed casing recipe 2017-03-22 19:07:27 +01:00
Blood-Asp
e986232c34 Fix nether stones not generating in nether if enabled in config 2017-03-22 19:03:09 +01:00
Blood-Asp
6376f8a3de Fix 2 recipes 2017-03-22 18:58:39 +01:00
Blood-Asp
1a973d2733 PIC Wafer needs cleanroom too 2017-03-22 18:21:15 +01:00
Blood-Asp
b20b69b80f Merge pull request #975 from Dimach/unstable-2
Fixed ores not generated sometimes.
2017-03-22 18:03:30 +01:00
Blood-Asp
0ee176c936 Merge pull request #974 from Dimach/unstable-1
Fixed double chance of first 16 custom ores.
2017-03-22 18:01:54 +01:00
Dimach
58301dbe0e Fixed ores not generated sometimes. 2017-03-18 19:43:32 +02:00
Dimach
2cf6ab4c4d Fixed double chance of first 16 custom ores. 2017-03-18 19:18:38 +02:00
Dimach
5e7d95284c Cleanup code. 2017-03-16 16:24:39 +02:00
MauveCloud
b9d4d15a0c Fix for negative-coordinate vein generation, adjustments to recipes for stone dust, sand, and flint 2017-03-16 16:24:39 +02:00
Dimach
e6f6150781 Cleanup code and fix incorrect merge. 2017-03-16 16:24:39 +02:00
Blood-Asp
f4dae834da Merge pull request #952 from Techlone/soldering_alloy
Config for using only soldering alloy
2017-03-16 14:56:45 +01:00
Blood-Asp
286267e98d Merge pull request #963 from Dimach/unstable
Implement #292.
2017-03-16 14:56:01 +01:00
Techlone
288f44e347 Added a sorting of recipes in NEI 2017-03-16 00:24:41 +05:00
Dimach
76e82ed355 Implement #292. 2017-03-15 04:51:15 +02:00
Techlone
556fa42c37 fix adv circuit 2017-03-12 23:45:12 +05:00
Techlone
f05f216f30 Added new config value useOnlyGoodSolderingMaterials 2017-03-12 00:16:10 +05:00
Blood-Asp
d7203bccbd Recipe fixes 2017-03-10 00:57:06 +01:00
Blood-Asp
cbb96f9c8a Actually allow pollution go down to 0 2017-03-08 18:14:33 +01:00
Blood-Asp
48d7a1ee5d Fix rubber plates in modular armor boots 2017-03-08 17:52:28 +01:00
Blood-Asp
9c7e95b245 Fix low grav processing check 2017-03-08 17:28:05 +01:00
Blood-Asp
875821ede2 Rebalance gallium usage early game 2017-03-08 17:12:07 +01:00
Blood-Asp
af43ebade1 Better circuit tooltips 2017-03-08 16:57:16 +01:00
Dimach
d6c321883e Cleanness now decrease slow. 2017-03-08 02:28:41 +02:00
Dimach
9fa8238765 Resolve #917. 2017-03-08 01:22:45 +02:00
Blood-Asp
7d0acb394d Merge pull request #937 from maixgame/unstable
Fixed #935
2017-03-07 17:07:43 +01:00
Maxime Legkiy
d60695addd Fix Pollution Neighbor BUG 2017-03-07 00:26:57 +03:00
Maxime Legkiy
c3101d6f04 Fixed #935 2017-03-06 22:26:16 +03:00
Maxime Legkiy
903661501e Fixed #935 2017-03-06 22:09:55 +03:00
Dimach
09c774689b Fixed #930. 2017-03-06 14:59:40 +02:00