Commit graph

1545 commits

Author SHA1 Message Date
Jason Mitchell
73ee102b63 Pipe/cable overhaul; Fluidfilter fix, GC Energy Compat & Misc fixes (#1495)
* Pipe overhaul & Fluidfilter fix

* GC Energy Compat & Misc fixes

* Only connect on the server side.

* Work with subclassed GT cables (ie: gt++ cables) & provide default implementation for new methods

* Better GC Compat (shouldn't require GC loaded to work now)

* Bump source compat to 1.8 to support default methods.  (Other option is to remove the default methods, but then it's less backwards compatiable)

* Remove java 1.8 features
2019-04-27 23:35:26 +02:00
Alkalus
cf57e09437
Merge pull request #1506 from Dimach/flask_fix
Fix flask crash on server
2019-02-08 04:57:52 +00:00
Alkalus
a99309df4d
Mild Adjustment to Meta ID allocations.
I realized I've been using 30k not 31k this whole time, so, might as well adjust this.
2019-01-30 00:29:38 +00:00
Blood Asp
c1f47091b7 reserve IDs 2019-01-08 18:30:41 +01:00
Dimach
db7c85e641 Fix flask crash on server 2018-12-13 12:22:51 +02:00
Blood Asp
88a7715fca depricate Phosphor 2018-12-12 18:55:39 +01:00
Dimach
eaa93a0a75 Add disable sort option for input bus. Default behavior will stay same 2018-12-12 09:25:36 +02:00
YoungGT
cd841ad39e Fix #1439 and #1456 (#1503)
* Fix #1439

* Fix #1456

* mistake
2018-12-10 00:16:02 +01:00
UhoMazino
8a61e384f0 Fix maintenance cover (#1496)
* New public variable init

Initiated new public variable which is calculate how much damage get turbine rotor per time, its needed to compare with actual rotor durability.

* Fix cover logic

Rewrited due a bug maintenance cover logic which is check turbine rotor needed maintenance or not.

* Added&rewrited some features for need maintenance.

Added new high accuracy mod for need maintenance cover which check rotor state.
Fixed old version low accuracy mod.

* redo older changes

removed variable

* fix some shit

forgot brakets

* Cleanup & reformat code

thanks Dimach for help with that
2018-12-09 16:43:20 +01:00
Dimach
0beea9037c Add volumetric flask. (#1500) 2018-12-09 16:39:06 +01:00
Dimach
d1e010d53f Better NC panel input/output format and additional book recipe (#1501)
* Update src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java

* Update src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
2018-12-09 16:34:11 +01:00
Léa Gris
3531fb264f Magical Energy Absorber fix stop drain and rework Vis to EU Conversion (#1478)
* fix(magicalenergyabsorber) stops when buffer can not store the next maximum eu output

* rework(magicalenergyabsorber): computation of vis to eu conversion

New configuration option to define how much EU Per Vis (not CVis)
I:EnergyPerVis_20=20
This value is divided by 100, so it is actually 0.2 EU per Vis

The Magical Energy Absorber will try to drain enough CVis, comulating all aspects,
until it can reach max Output, or has drained all available aspects.

Number of total cummulated CVis output required in a Node per Magical Energy Absorber Tier:

Novice (LV):
√(32 × 10000 ÷ (20 × 90)) = 13,333333333 ⇒ 13 CVis

Adept (MV);
√(128 × 10000 ÷ (20 × 80)) = 28,2843 ⇒ 28 CVis

Master (HV):
√(512 × 10000 ÷ (20 × 70)) = 60,474315681 ⇒ 60 CVis

Grand Master (EV):
√(2048 × 10000 ÷ (20 × 60)) = 130,639452948 ⇒ 131 CVis

As referrence:
The Huge Creative Node from Thaumcraft has 500 of each primal aspects.

* fix(machine): magic energy absorber

- Fixed Dragon Egg Siphon mode to work as intended when
  `B:MagicEnergyAbsorber.AllowMultipleEggs_false=false` (fix #1482)
- Fixed Vis drain from Visnet (Energized Node/Vis Relay) drain rate
  (fix #1119)
- Added Vis conversion as a configuration option:
  `I:MagicEnergyAbsorber.EnergyPerVis_20=20`
- Replaced broken Aspect drain from items, with drain from Essentia
  Containers in range, using same mechanic as the Infusion Altar
- Added Essentia Aspect conversion as a configuration option:
  `I:MagicEnergyAbsorber.EnergyPerEssentia_320=320`
- Fixed Enchantments drain to convert all available enchantments
- Made input filtered to valid enchanted items/books (Item must be
  enchantable and enchanted)
- Fixed Enchantments drain to not consume input; if it can not buffer
  generated energy from it, or if it can not output disenchanted item
- Added a user settable Tiered operation range using a Screwdriver.
  Default Range Tier is Machine Tier.
  Max Range Tier is Machine Tier + 2.
  Range is 2^(Range Tier): 1, 2, 4, 8, 16, 32, 64 blocks
- Fixed Ender Crystal drain mechanic, to allow multiple Crystals to be
  drained.
- Made each in-use Ender Crystal, exclusive to a Magic Energy Absorber
- Improved default Ender Crystal energy worth to 512EU/t instead of
  32EU/t
2018-10-07 18:17:17 +02:00
Léa Gris
6a1b45f2be fix(blockmachines): persistency on harvest (#1498)
This patch fixes persistency of NBT tags in machine item when machine block is harvested.

Machines with an @Override on setItemNBT will now persist data correctly when harvested?

Change fixes intended persistency behaviour of following machines:
- Item buffers will persist screwdriver configured output stack size when harvested.
- Item distributors will persist setings of items per face.
2018-10-07 18:10:35 +02:00
Спартак
2e59ff84b6 Assembler recipes for Pump Covers (#1487)
* Assembler recipes for Pump Covers

* Update GT_MachineRecipeLoader.java

* Fix recipes
2018-10-07 18:08:46 +02:00
Спартак
1568303eca Fixed BorosilicateGlass recipe (#1486)
I changed recipe in Mixer, because in shaped recipe using 7 glass dust but in machine 1.
2018-10-07 18:07:34 +02:00
Léa Gris
45bee961bf fix(oilsand ore): centrifuge recipes (#1485)
- fix chance for sand output from 0.63% to 50%-25% depending on richness
- fix rich oilsand ore flagging
2018-10-07 18:06:44 +02:00
Dimach
b46a466878 Fixed bug in macerator recipes. (#1468) 2018-10-07 18:04:47 +02:00
Léa Gris
d3c43ea90b % fix(texture): fusion control computer gui (#1462)
Fix #1461 Fusion Control Computer GUI

  ~~HULL~~ → CASING
  ~~PLASMA EXTRACTOR~~ → **OUTPUT HATCH**
  ~~ENERGY INJECTOR~~ → **ENERGY HATCH**
  ~~MATERIAL INJECTORS~~ → **INPUT HATCHES**
2018-10-07 18:03:40 +02:00
Dimach
c664a810e7 Fixed error in multiblock drillers. (#1452) 2018-10-07 18:03:16 +02:00
redmage17
eef9513ef2 Add config for Small Boiler Automation (#1449)
* Add config for Small Boiler Automation

Default is off

* Update GT_Mod.java

* Update GT_Mod.java

* Update GT_MetaTileEntity_Boiler.java

Fixed retarded logic
2018-10-07 18:02:31 +02:00
Dimach
02b24ba235 Fixed error in tungstensteel multipipes name. (#1446) 2018-10-07 18:02:06 +02:00
bartimaeusnek
66379be310
changed range to the "next one who asks me" range... 2018-07-02 04:59:34 +02:00
bartimaeusnek
780410ce0a
added range for bartimaeusnek
would be great if i could get this range for my mod crops++, my fork of EMT, and some other small addons
2018-07-02 04:43:41 +02:00
Daniel
086661024a
Add techtech range 2018-05-07 17:46:29 +02:00
SteelGiant87
fd56cf48a3 Small lava boiler "calcification" mechanic (#1316)
* Small lava boiler now produces impure stone dust in output slot. Efficiency drops to 33% as output fills up.

* changed tooltip

* Added config option for small lava boiler efficiency loss due to byproduct buildup.
2018-04-11 23:36:34 +02:00
JohannesGaessler
8ee2d52dfa Fixed Electrolysis of SO2/CO2 only working when using complicated chem (#1401) 2018-04-11 23:34:43 +02:00
Wo0kiee
be7c5d7c49 Oil Drilling Rig fixes (#1410)
* Fix Oil drilling rig

With negative coordinates ODR get wrong location

* Oil Drilling Rig fix

ODR now gets right oil amount from chunk list.

* ODR doesn't lift up pipes

* ODR doesn't lift up pipes

* GT_Log removed

* ODR tier1 doesn't lift up pipes
2018-04-11 23:34:31 +02:00
Servek
0c52368524 Fixed bug - Axe harvest stone blocks from Underground Biomes Construct (#1434) 2018-04-11 23:33:51 +02:00
Dimach
b397abae97 Fixed #1406 (#1413)
* Fixed #1406

* Rewritten pipes logic, now it less complex and more optimized.
Fixed bug when pipes sometimes cant insert steam into steam machines.
2018-04-11 23:33:13 +02:00
Wo0kiee
fcdb80b886 Adv seismic prospector reworked (#1419)
* Adv Seismic Prospector reworked

Prospects from NW to SE 9 of oilfields (6x6 chunks each) and output min-max oil amount

* deleted formatting codes

* Cleanup

* Added description

* Added description

* Cleanup imports

* Adv Seismic Prospector
2018-04-11 23:31:01 +02:00
Dimach
860cc0daf0 Fixed bug in filter behavior. (#1425) 2018-04-11 23:29:32 +02:00
Dimach
7e2d9076b2 Fixed bug - drain cover don't work when installed on pipe. (#1428) 2018-04-11 23:28:58 +02:00
Daniel
ddd82e57e9 Up cast total EU to long (#1430)
* Up cast to long

* Up cast to long
2018-04-11 23:28:09 +02:00
Servek
3936cf7906 FIX - Updated Frequency Transmitter Recipe (#1435) 2018-04-11 23:27:21 +02:00
Servek
c653af1946 FEATURE - Added Extruder recipe for Small Gear (#1436) 2018-04-11 23:26:46 +02:00
Muramasa-
c8714e9675 Forgot about combs 2018-02-24 15:20:11 +00:00
Muramasa-
45342f945e Remove huge wrought iron pipe 2018-02-18 08:33:35 +00:00
Muramasa-
a6c31a3c30 Remove ore items for chrome and naquadria 2018-02-18 08:25:08 +00:00
Muramasa-
90cfe210a5 add IHL to ModSupport 2018-02-18 08:03:15 +00:00
Muramasa-
f1199094d7 Cleanup Materials/ModSupport 2018-02-18 07:44:02 +00:00
JohannesGaessler
6eb95c1057 Gasoline revision (#1398)
* Fixed Gasoline recipe input Materials and output FluidStack sizes

Gasoline recipes used Acetone, which was only obtainable with
complicated chemistry.
They now use AceticAcid for simple chemistry.

The recipe for GasolinePremium had an output FluidStack size of 32000L,
which exceeds the 8000L output tank size of the Mixer.
To fix this the recipe now outputs a stack of Cells rather than a
FluidStack.
Since this reduces the number of available inputs by one Octane is no
longer required for producing GasolinePremium.
The Octane Material has been removed since it no longer has any use and
was only obtainable by cracking LightFuel.

* Slightly simplified Gasoline production

Removed the GasolineRaw intermediary material.
Gasoline no longer requires Gas.

* Resolved a conflict between NO2 and N2O recipes
2018-02-18 00:02:45 +01:00
Sirse
bc2d51b4ff Create ru_RU.lang (#1395) 2018-02-14 22:33:12 +01:00
DerMilchkarton
7cc4d69c1c Update de_DE.lang (#1394) 2018-02-14 22:31:59 +01:00
Blood-Asp
4b2c122a00 Fix #1356 2018-02-12 23:48:18 +01:00
Blood-Asp
632d9fc754 Fix Fusion reactor possibly taking damage. 2018-02-12 23:25:37 +01:00
Antifluxfield
a205cbccd0 Should fix #1389 (#1392) 2018-02-12 23:11:54 +01:00
Alkalus
480e087bf0 Magneticraft & FMP Dependency (#1304)
* Removed requirement for Magneticraft & FMP in dev.

* Added logging for bad reflection attempts.
2018-02-11 23:15:43 +01:00
shpakovivan
cc40637087 Fix: Fluid pipes transfer capacity (#1378)
* Fix: Fluid pipes transfer capacity

* Fix: Not all GT machines return fluid tank info
2018-02-11 23:13:50 +01:00
DerMilchkarton
2cea339c9b Create de_DE.lang (#1385) 2018-02-10 20:55:19 +01:00
shpakovivan
5410ce6f00 Fix: Large Boiler ignore Programmed Circuit (#1384) 2018-02-10 20:54:16 +01:00
shpakovivan
c0d544e555 Fix: GregTech Axe don't harvest blocks that have not harvest tool (harvest tool is "null") (#1382) 2018-02-10 20:53:42 +01:00
Antifluxfield
d553daacd6 Fix custom enchantment for materials (#1374) 2018-02-10 20:52:38 +01:00
Jason Mitchell
2b21b51b64 Update drain/fill to take into account pipe connections (#1371) 2018-02-10 20:51:55 +01:00
Antifluxfield
4a4f7da15f Oredict support for AssLine Recipe (#1363) 2018-02-10 20:50:45 +01:00
Antifluxfield
548f5ec252 NEI support enhancement (#1361)
* NEI page access of Primitive Blast Furnace

* Fix #1039
2018-02-10 20:49:30 +01:00
Antifluxfield
38d150a90b Fix that the main facing of basic machines can be set to top/bottom (#1354) 2018-02-10 19:25:29 +01:00
Antifluxfield
d1c2477ea9 patch a render issue (#1353) 2018-02-10 19:24:47 +01:00
Jason Mitchell
5cb5bd0bc5 GT6 cable quality of life improvements (#1349)
* Allow use of wire cutter/soldering item on the tile entity, as well as the wire, for a connect/disconnect

* revert soldering iron changes

* Added missing overlays, made the passtrough of wire cutting/connectiong trough gt machine blocks work only if the player is isneaking. And because of that, added back the soldering iron support.

* Solar Panel Fix

Two main pieces:
1) Updates solar panel (cover) behavior to always show connected, and
allows connect() to work without a tile entity.  This bit is mostly
optional and mainly included so the client renders the panels as
connected.

2) Updates injectEnergy() to allow injection from unconnected, but
UNKNOWN directions (6) - which is what solar panels and transformers
use.

* Make AE2 GT-p2p tunnels connect to gt cables
2018-02-10 19:24:03 +01:00
Antifluxfield
8a1f56d908 Fix iridium neutron reflector behavior (#1348) 2018-02-10 19:22:06 +01:00
Antifluxfield
a3f1b52759 Localization (#1346)
* Config to disable placeholder "%material"

* Fix l10n of pipe description

* Fix wrong l10n key of item pipes

* Side protection
2018-02-10 19:06:32 +01:00
Léa Gris
7d36c606c5 [unstable branch] Converted to PNG as it should be. (#1345)
Replaces:
https://github.com/Blood-Asp/GT5-Unofficial/pull/1337
2018-02-10 19:05:44 +01:00
SuperCoder79
30eb5f0d83 Change diesel to combustion (#1343) 2018-02-10 19:05:25 +01:00
SuperCoder79
15aa49ae6e Rework gasoline (#1342)
* Fix issues with mixer only having 8000L buffer

* Change high octane gasoline recipe to be balanced
2018-02-10 19:04:48 +01:00
JohannesGaessler
4481aec44f Chemistry revision: Volume conservation and simpler recipes (#1334)
* Rebalanced chemistry material ratios, simplified cracking

Chemical recipes now conserve material volumes.
Cracking no longer has three different severity settings.
Each material only has one recipe for Steam-Cracking and one recipe for
Hydro-Cracking

* Added simple variants of the overhauled chemical recipes

* Fixed a bug where the game would crash with IC2Classic installed
2018-02-10 19:03:40 +01:00
Alkalus
92bcce8fd5 Fixed Mufflers and Large Boiler Fuels. (#1319)
* Fixed Muffler abuse. They can no longer face downwards, into a machine.

* Lava in Large Boiler Fix.
"The Large Boiler can burn almost all forms of solid and liquid fuel, except lava." - https://ftb.gamepedia.com/Large_Boiler

* Improved Large Boiler Tooltip, Fixes #1314.
2018-02-10 18:54:15 +01:00
JohannesGaessler
65930a207b Electrolysis of Sulfur Dioxide/Carbon Dioxide (#1307)
* Increased energy cost of electrolyzing Carbon Dioxide, Sulfur Dioxide

* Rebalanced CO2/SO2 electrolysis recipes to conserve volumes
2018-02-10 18:28:46 +01:00
SteelGiant87
e63b03584e Bugfix: Small boiler ash types mixing (#1303)
* Bugfix: Small boiler ash types mixing

Issue: Small boilers that had ash in the byproduct slot would not produce more byproduct if the fuel type was changed to one that produced a different type of ash e.g. burn a couple of coal until there is one DarkAsh in the byproduct slot, then charcoal will produce no Ash in that stack
Fix: When mixing ash types, convert all the ash to less valuable light ashes - prevents any exploits for creating more dark ashes.
Issue: Boilers did not stop burning fuel when full of ash
Fix: added explicit check so that boilers can't burn fuel when output is stuffed (this may be a balance change, so can be removed if undesirable) 
Small refactoring of fuel logic so that ash conversion logic does not need to be repeated
Started with small bronze boiler, will extend fix to small steel boiler if general structure approved

Addresses issue #1302

* Fixed imports and typo

* Extended change to small steel boiler as well
2018-02-10 18:25:46 +01:00
Alkalus
7f08c17bfc
Reserved some Meta Tile ID's. 2018-01-30 00:29:17 +10:00
Antifluxfield
d66cecbd6b Improve the mechanism of custom materials (#1341) 2017-12-21 22:02:49 +01:00
Antifluxfield
f73c0fd7ef Fix pipe behaviors (#1329)
* Try to fix #1301

* Fix pipe behavior with covers at side

* Fix item pipe & cable behavior

* Update

* Update 2

* Based on @mitchej123 's work
2017-12-21 21:58:34 +01:00
JohannesGaessler
a40750b3b8 Fixed RawRubber from Isoprene recipe (#1311) 2017-12-21 20:49:07 +01:00
Antifluxfield
a7f5b9bf35 Fix wrong translation (#1309) 2017-12-21 20:46:12 +01:00
YoungGT
e97f2e437c
Update zh_CN.lang 2017-12-21 12:48:15 +08:00
YoungGT
ac87a0ce8e
Update en_US.lang 2017-12-21 12:47:23 +08:00
YoungGT
34f885071a
Fix a bug about achievements
We can find that there's always two achievements between "As Dense As Possible" and "What now?" whether you opened the batteries or not,so this PR would like to fix this.
2017-11-27 22:43:50 +08:00
YoungGT
df081bd0a7
Update zh_CN.lang 2017-11-27 22:31:24 +08:00
YoungGT
1c8ef742d7
Update language files
Added entries for these achievements,and fixed the wrong entries.
2017-11-27 22:14:27 +08:00
Blood-Asp
f9c8159f09 Default off config for GalacticraftOil compat 2017-11-25 22:49:00 +01:00
Blood-Asp
b96180ac4f GT6 style concrete speedup (no soulsand like behavior that blocks you from entrances and less OP ice hyperspeed highways) 2017-11-25 22:41:41 +01:00
Blood-Asp
0305f8626e Oredict fixes 2017-11-25 21:45:11 +01:00
Blood-Asp
4ae74f6ca4 Lossy Imp Compressor recipes for higher tier gems from lower tier gems. 2017-11-25 21:31:30 +01:00
Blood-Asp
4b65784535 Alternative high tier Lapo Orb Cluster recipe to reduce nessary Lapocrystal amount. 2017-11-25 21:30:22 +01:00
Blood-Asp
de94c67ede Cheaper SoC 2017-11-25 20:54:25 +01:00
Blood-Asp
e9627a540a Rebalance Tritanium cost, add new fusion recipes (Tungsten + Indium prod) 2017-11-25 19:41:21 +01:00
Blood-Asp
84e95d30ab
Merge pull request #1300 from mitchej123/bloody_unstable
Single block pump refactor & bugfix
2017-11-25 19:02:00 +01:00
Blood-Asp
7ce0ce850c
Merge pull request #1298 from JohannesGaessler/MoreFlexibleLCRStructure
More Flexible Large Chemical Reactor structure
2017-11-25 19:00:20 +01:00
Blood-Asp
d6cbc4725f
Merge pull request #1297 from JohannesGaessler/MoreFlexibleOilCrackerStructure
More flexible Oil Cracker structure
2017-11-25 18:59:28 +01:00
Blood-Asp
eb7185ca85
Merge pull request #1284 from redmage17/unstable
Configed Machine Casings
2017-11-25 18:57:52 +01:00
Blood-Asp
87210137d0
Merge branch 'unstable' into CrackingFollowup 2017-11-25 18:54:57 +01:00
Blood-Asp
a2c7e31602
Merge pull request #1279 from JohannesGaessler/ResistorRecipeChange
Resistor recipe change
2017-11-25 18:49:29 +01:00
Blood-Asp
1e620c0177
Merge pull request #1276 from SuperCoder7979/Gasoline
Gasoline
2017-11-25 18:48:53 +01:00
Blood-Asp
af7e1d800d
Merge pull request #1272 from SuperCoder7979/Magic-Fix
Magic fix
2017-11-25 18:46:09 +01:00
Blood-Asp
dbbefafbcc
Merge branch 'unstable' into GT6-styled_pipes 2017-11-25 18:43:13 +01:00
Alkalus
1c9c9af45b
Merge pull request #1296 from JohannesGaessler/MorePhenolRecipes
More Phenol recipes
2017-11-24 11:21:47 +10:00
Alkalus
c7edbf14ea
Merge pull request #1289 from Dimach/diesel
Added large diesel repair status to NC info panel.
2017-11-24 11:21:35 +10:00
Jason Mitchell
2dc5b03f14 Single block pump refactor & bugfix:
1) Pump will properly save it's state and reload with chunk load/reload.
It remembers that it was pumping and doesn't immediately move down.
Additionally, corrected saving of fluid type so it will properly look it
up when it reloads

2) Fixed getYHeadOfPump() so it doesn't punch through bedrock if you
destroy the pump head.  If you break a gap into an existing pipe line,
it will move down through the broken spots until it finds an existing
set of pipes - in which case it will continue from the bottom.  If you
break the pump head, it will replace the last pipe with a new Head and
carry on about it's business.
2017-11-23 17:21:05 -08:00
Dimach
c7177dcf9a Added info to small miners tooltip. (#1287)
* Added info to small miners tooltip.
2017-11-24 11:21:05 +10:00
Alkalus
e7ea8847b9
Merge pull request #1281 from JohannesGaessler/ForgottenTFERecipe
Forgotten Tetrafluoroethylene recipe
2017-11-24 11:20:28 +10:00
JohannesGaessler
5fc136166e Fixed a bug where restricting Output Hatches caused severe log spam (#1299) 2017-11-24 09:58:42 +10:00
Johannes Gäßler
5476c4ea39 Increased the yields of cracked Heavy Fuel, Light Fuel, Naphtha 2017-11-23 19:20:10 +01:00