aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders
AgeCommit message (Collapse)Author
2023-04-21Stellar catalyst + catalyst fixes + new materials class (#1893)GDCloud
* add catalyst * pu plasma recipe * increase plasma mixer input slots * noOptimize + mixer recipe + voltage fix * noOptimize + PLE recipe * TPM recipe * spotlessApply (#1894) Co-authored-by: GitHub GTNH Actions <> * add two more plasma recipes * replace neptunium & fermium plasma * spotless * fix stellar plasma amount * new materials class --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-04-12Adjust time and voltage for a few assembler recipes (#1877)chochem
* rebalance 1 and 2 eu/t assembler recipes * comparators, repeaters
2023-04-11Re-add a bunch of recipes that went missing (#1874)chochem
* readd 29 recipes * sa * convert steam valves to RA2 * convert schematic recipes * convert energy hatch recipes * more energy hatches * convert dynamos * convert LD pipelines * convert quadruple hatches * convert gearbox * fix fluids for quadruple
2023-04-10Further RA2 recipe fixes (#1870)chochem
* there is no graphite block * fix old RA1 remnants and nulls * more dt null checks * remove nonexistent potions from fermenting * railcraft anvil fixes * fix tainted magic fuel values * fix railcraft creosote block
2023-04-10Update spotless config to 0.2.2Raven Szewczyk
2023-04-10Next round of RA2 recipe fixes (#1869)chochem
* brewing water fixes * fix gt potion brewing * actually check for the null
2023-04-10More RA2 GT recipes fixes (#1866)chochem
* no TE * convert 2 old recipes (and sa) * 13 more * fix spinneret * fix all hatches and busses * even more output hatch fixes * one more getfluid
2023-04-09no molten carbon (#1865)chochem
2023-04-08Kill Disassembler 🔪 (#1855)Connor-Colenso
* Kill disassembler * Kill disassembler * Change arc furnace to fulfil Dreams request. --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2023-04-08reenable EBF recipes (#1853)chochem
2023-04-08fix uv motor (#1854)chochem
2023-04-08null checks for ingots (#1852)chochem
2023-04-08Rework quantum anomaly dtpf recipe (#1850)GDCloud
* rework recipe * spotlessApply (#1851) Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-04-08reenable 11 missing materials (#1846)chochem
2023-04-08Fix TPM recipes (#1847)GDCloud
* fix recipes * spotlessApply (#1848) Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-04-07Wiremillfix (#1843)chochem
* finewire check * prefix2 check * make logic clear
2023-04-04Modid work (#1833)boubou19
* add all mods founds in NHCore * depracte old strings * add ars magica 2 * more enum work * use a switch * spotless * more mod id rework * more mod id rework * more mod id rework * should be last * spotless * rename to make more sense * add path attribute * add getResourcePath to enum * spotless
2023-04-03Fix RA2 bugs (#1830)boubou19
* fix pulverizer chances mistakes * fix block version of the PBF * use properly RA2 for PBF recipes * spotlessApply (#1831) Co-authored-by: GitHub GTNH Actions <> * enable lots of materials by default * fixes, documentation, and minor api contract update * spotless --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
2023-04-01Jabel, Generic injection and mostly automatic code cleanup (#1829)Raven Szewczyk
* Enable Jabel&Generic injection, fix type error caused by this * add missing <> * Infer generic types automatically * Parametrize cast types * Use enhanced for loops * Unnecessary boxing * Unnecessary unboxing * Use Objects.equals * Explicit type can be replaced with `<>` * Collapse identical catch blocks * Add SafeVarargs where applicable * Anonymous type can be replaced with lambda * Use List.sort directly * Lambda can be a method reference * Statement lambda can be an expression lambda * Use string switches * Instanceof pattern matching * Text block can be used * Migrate to enhanced switch * Java style array declarations * Unnecessary toString() * More unnecessary String conversions * Unnecessary modifiers * Unnecessary semicolons * Fix duplicate conditions * Extract common code from if branches * Replace switches with ifs for 1-2 cases * Inner class may be static * Minor performance issues * Replace string appending in loops with string builders * Fix IntelliJ using the wrong empty list method * Use Long.compare * Generic arguments: getSubItems * Generic arguments: getSubBlocks * Raw types warnings * Fix remaining missing generics * Too weak variable type leads to unnecessary cast * Redundant type casts * Redundant array length check * Redundant vararg arrays * Manual min/max implementations * A couple missed inspections * Goodbye explosion power ternary ladder * Apply spotless * Get rid of the other two big ternary ladders * Binary search explosion power * Don't overcomplicate things
2023-04-01fix pulverizer chances mistakes (#1828)boubou19
2023-04-01update spotless formatting (#1827)boubou19
2023-04-01Recipe Adder v2 (#1770)Glease
* add everything * fixes * migrate plasma forge recipes * syntax update * make chances array length differ a fatal error * time constants + long eut overload * migrate extruder recipes * migrate electromagnetic separator recipes * migrate wiremill recipes * migrate forming press recipes * migrate bender recipes * add doc to clarify the three itemInputs * migrate alloy smelter recipes * migrate arc furnace recipes * added ModIDs enum * sort ModIDs * migrate autoclave recipes * migrated some assembler recipes * split a bit more assembler recipes * migrate canner recipes * migrate brewing recipes * ic2 mod check in canner recipes * use some loops to reduce the amount of recipes to migrate * add requested helper methods * migrate vacuum freezer recipes * migrate thermal centrifuge recipes * format smelter recipes only, doesn't go through normal GT recipe * migrated slicer recipes * migrated sifter recipes * Use proper enum now * remove more constants * cleaning cutting recipes before migration * remove tons of dead commented recipes * migrate pyrolyse recipes * use ModIDs enum more * migrate printer recipes * add a less confusing way to specify value of specialItem * migrate pulverizer recipes * less confusing special item specification * even more ModIDs enum usage * fix auto * import confusing Minecraft enum value with Minecraft client object * migrated blast furnace recipes * migrated Centrifuge recipes * migrated assembler recipes * migrated implosion compressor recipes * migrated extractor recipes * migrated mixer recipes * remove useless code * mgrate universal chemical recipes * refactor chemical recipes * migrate single block only chem reactor recipes * migrate chem reactor recipes * reworked circuit assembler recipes before migrating them * migrated circuit assembler recipes * fix merge conflict for assembler recipes * remove leftover of the merge conflicts * fix weird translation glitch * example of assembly line recipe using RA2 * bugfixes for assline * remove specialValue usage in blast furnace recipes * fix more bugs * add nooptimize to where it make sense * add recipe descriptions * Materials.Superconductor -> Materials.SuperconductorUHV * remove useless Object creations * remove explicit long casts * migrate assemblyline recipes * migrate chemical bath recipes * migrate compressor recipes * move smelting recipe where it belongs * migrated cutting machine recipes * migrated fermenter recipes (unhide alcohol) * remove explicit long casts * migrate fluid canner recipes * migrate fluid heater recipes * migrated fusion recipes * migrated lathe recipes * migrated laser engraver recipes * migrated packager recipes * migrated forge hammer recipes * migrated TPM recipes * exit early and reduced indents * migrated fluid extractor recipes * migrated fluid solidifier recipes * migrated electrolyzer recipes * migrated crop processing recipes * migrated default polymerization recipes * migrate distillery recipes * migrate matter amplifier recipes * add metadata identifier for fusion ignition threshold * migrate fuel recipes * update bs (cherry picked from commit c2d931c9b6caa0376e9d50591894cd849021104d) * spotless (cherry picked from commit 1060f5357fb95e28bfae1f052025f55dabc21a0f) * guard against null itemstacks * wrong translation * fix empty arrays being accessed * add 0 duration and 0 EU/t for fuel recipes * fix typo in matter amplifier recipes * spotless apply --------- Co-authored-by: boubou19 <miisterunknown@gmail.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2023-04-01Implement Power Logic, Pollution Logic and Processing Logic for MuTEs and ↵BlueWeabo
many other things (#1823) * update bs 2 * fuel consumption and energy implementation. clean up * don't register XD * some clean up * coke oven work * semi-working coke oven somehow i broke the activating of the multiblock * power logic * PowerLogic * clean up, saving loading nbt * small cleanup and pollution * pollution working :P * Energy mostly working, wallsharing * processing logic * fix npe and deregister * review requests * missed one * remove extra 0
2023-03-30Steel bee + Salt bee change (#1815)Runakai1
* Change Bee things Removes hot breeding requirement on steel bee (makes its incredibly difficult to the point its not a valid early game bee) changed salt bee temp to normal. * Change Steel and Salt bee Remove hot breeding requirement and change salt bees req. to arid and warm
2023-03-22Added sound to distillery (#1809)Maxim
2023-03-20Change osmiridium to ruridit in gt directly (#1801)chochem
* first try * sa * fix * apply to everything * SA * dont forget luv coil
2023-03-18fix the machine's tooltip doesn't automatically generate when loading (#1799)iouter
* register tooltips * merge master (#1800) * Added custom click sound for the power switch (#1798) * Auto-stock for stocking input bus (#1790) * Add auto-stock for stocking input bus * Add GUI support for autostock and min input limiting. * Added support for copy+pasting config w/ data sticks * typo * correct order * fixes * update branch (#1795) * Send cover data immediately when cover is placed (#1791) * migrate ore prefixes from gt++ and bw (#1792) OrePrefixes are used in switch case a lot and this prevents it from being a valid EnumHelper target. Under the hood for huge enum switch cases, javac will generate a synthetic class with a synthetic static final int[] field to hold switch map. If the OrePrefixes is ever extended, said switch map will be smaller than actual and cause ArrayIndexOutOfBoundException. This moves all addon added ore prefixes back to main mod. This also cleans up the obnoxious comment blocks created by spotless. * Fix advanced external transmitter cover (#1793) * change tpv back to 4k * Revert "change tpv back to 4k" This reverts commit 3560a670e3d697b26014f6320e344867953684e7. * change Tungstensteel to 4k * Add regulator abilities to Steam Valve (#1785) * fix: fix Steam Valve not being configurable * Revert "fix: fix Steam Valve not being configurable" This reverts commit 505d9e273b48315fde154490e116d58fed46ffaf. * feat: add steam regulator * feat: add superheated steam to steam valve * update bs * update to subversion 42 --------- Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: Matej Dipčár <492666@mail.muni.cz> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: NexusNull <p.wellershaus@googlemail.com> * fix --------- Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: Matej Dipčár <492666@mail.muni.cz> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: NexusNull <p.wellershaus@googlemail.com> --------- Co-authored-by: Maxim <maxim235@gmx.de> Co-authored-by: MadMan310 <66886359+MadMan310@users.noreply.github.com> Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: Matej Dipčár <492666@mail.muni.cz> Co-authored-by: NexusNull <p.wellershaus@googlemail.com> * Revert "merge master (#1800)" This reverts commit dafbaf22fd6bef1112143b80d35eae9c60880dfc. --------- Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Maxim <maxim235@gmx.de> Co-authored-by: MadMan310 <66886359+MadMan310@users.noreply.github.com> Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: Matej Dipčár <492666@mail.muni.cz> Co-authored-by: NexusNull <p.wellershaus@googlemail.com>
2023-03-11Add regulator abilities to Steam Valve (#1785)NexusNull
* fix: fix Steam Valve not being configurable * Revert "fix: fix Steam Valve not being configurable" This reverts commit 505d9e273b48315fde154490e116d58fed46ffaf. * feat: add steam regulator * feat: add superheated steam to steam valve
2023-03-07Fix Recipes of TPM (#1786)LewisSaber
2023-03-01change to GT steel block (#1780)chochem
2023-02-28minimal tiereu fix (#1778)chochem
2023-02-28Revert "use tiereu and use it correctly (#1774)" (#1777)chochem
This reverts commit 7f0c2e39d7e73b1301cdd881d93e1324312262ec.
2023-02-26Multiblock Sounds (#1768)Maxim
* Added methods to allow multiblocks to play sounds * Implemented first few sounds * Added sound to PA * Introduced static variables for sound indexes
2023-02-26use tiereu and use it correctly (#1774)chochem
2023-02-25lava centrifuge recipe fix & tweaks (#1769)Glease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2023-02-22Change amount of grinding heads in Ore Factory recipe (#1764)LewisSaber
2023-02-21Add back Single-block Indium Concentrate recipe (#1760)BritishCynic
* Update ChemicalRecipes.java Updates the smaller Indium Concentrate recipe to use a circuit so that the LCR will use the larger one when circuit 8 is used. * Update ChemicalRecipes.java Fix voltage and recipe time back to original 3s @ 150 EU/t. * Update ChemicalRecipes.java Add back 0-circuit Indium Concentrate recipe, but only for the Single-block Chemical Reactor.
2023-02-21Update ChemicalRecipes.java (#1758)BritishCynic
* Update ChemicalRecipes.java Updates the smaller Indium Concentrate recipe to use a circuit so that the LCR will use the larger one when circuit 8 is used. * Update ChemicalRecipes.java Fix voltage and recipe time back to original 3s @ 150 EU/t.
2023-02-19Make material renderer available for arbitrary item (#1753)miozune
* Make material renderer available for arbitrary item * pass render pass
2023-02-17Add Hodgepodge compat (#1752)miozune
* Add Hodgepodge compat * cleanup * Fix for fluid inside large cell
2023-02-14Fix missing textures (#1732)Connor-Colenso
* New texture * Blade * Change molten space and time names. * Update fluid names * Bump dep of AE2 * Bump dep of AE2 * spotlessApply (#1733) Co-authored-by: GitHub GTNH Actions <> * New fluid solidifer method * Space * Spotless * New recipes for new white dwarf matter shapes. * Universium block * Universium nanites * Spotless * Add some fine wires --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-02-12Fix ore dict with space dusts (#1731)Connor-Colenso
* New texture * Blade * Change molten space and time names. * Update fluid names * Bump dep of AE2 --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2023-02-10Rfg cleanup (#1726)Raven Szewczyk
* Update buildscript, add all recently added gradle.properties entries * Dependency version bumps and cleanup * Bump eternal singularity version * Update buildscript * Make AE2 a required dependency * Switch version to class generation from token replacement
2023-02-09LV-IV forgehammer (#1725)chochem
2023-02-07Mte inventory block (#1692)BlueWeabo
MTE Inventory Upgrade * inventories saved to nbt in controller * bump up ModularUI to fix labels * inventory renaming * fix inventories not syncing * more nbt saving and loading * unregister inventory on block break * example of a block being made from the same class * clear UpgradeCasing list every structure check * fix inventory halving to 0 * sync inventory name for upgrade block * switch to its own method of sending client data --------- Co-authored-by: Jason Mitchell <mitchej+github@gmail.com>
2023-02-07TypoGTNH-Colen
2023-02-05Centrifuge Recipes for U235 - Tweaks (#1708)Daniel Mendes
* Centrifuge Recipes for U235 - Tweaks * Correct Values to Previous PR
2023-02-05Add TPM Multiblock (#1718)Connor-Colenso
* Remove warning suppression * New helper default method * Initial work on TPM * Bump dep for structure lib and modular UI * Structure works + recipe map * Working * Tooltip and NEI work * Change controller texture * spotlessApply (#1719) * Fix wrong order * Add override * Spotless * Big opps lol * Comment * Spotless --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-02-04Add Hazmat infusion enchantment recipe (#1715)David Lindström
* Add Infusion Enchantment support to IThaumcraftCompat and implementation * Add Infusion Enchantment recipe for Hazmat enchant
2023-02-01Readd recipes for Hatches and Busses (#1711)chochem