aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders
AgeCommit message (Collapse)Author
2023-07-19fix input and output being switched (#2149)BlueWeabo
2023-07-18Added machine type on single block tooltips (#2138)boubou19
* change tooltips * put machine types together * Added constructor to accept multi line tooltip on sbs * sorting machine registering methods * update MachineType * migrate machines to multiline description * add new constructor for matter amplifier * migrate matter amplifier to multi line tooltip * spotless apply * Capitalize machine types * breakdown large run methods into themed methods * migrate TE IDs to an enum (1/?) * spotless apply * migrate TE IDs to an enum (2/?) * migrate TE IDs to an enum (3/?) * migrate TE IDs to an enum (4/?) * spotless apply * sorting crafting recipes by type + fix meta id typo * migrate TE IDs to an enum(5/?) * spotless apply * merge master (#2143) * Make structure tooltips more colorful (#2133) * default color changes * add colored casing amount builders * oversight * address reviews * GPL Special Item access (#2134) * Added getters to allow a machine to set the special item for recipe checking * Changes to ore factorys running mode description (#2135) * Changes the integrated ore factory mode description to match what its actually doing. * Some tooltip grammar changes. That would have annoyed me :) * Enable void protection for PA (#2136) * Added ofNoOverclock builder that accepts eut and duration (#2140) * Fix findRecipe might limit stack size by 64 (#2139) * Fix potential issue with applecore ItemFoodProxy (#2137) * Fix potential issue with applecore ItemFoodProxy * Fix the worst class loader issue ive ever encountered --------- Co-authored-by: GDCloud <93287602+GDCloudstrike@users.noreply.github.com> Co-authored-by: Maxim <maxim235@gmx.de> Co-authored-by: Lyfts <127234178+Lyfts@users.noreply.github.com> Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: Serenibyss <10861407+serenibyss@users.noreply.github.com> * Moved machine type and descriptions to lang files * Removed redundant visibility modifier * Only expose translated descriptions * Using prefix gt.recipe for NEI compatibility * Deprecate use of LanguageManager in GT_Recipe_Map * Unify GT_Recipe and MachineType localization * Electromagnetic Polarizer consistency with Separator * Added Packager MachineType * Added Scanner MachineType * Added Rock breaker MachineType * Added Mass Fabricator MachineType * Added Replicator MachineType * Added "Machine Type" tooltip to steam machines * public modifier unnecessary * Spotless apply --------- Co-authored-by: minecraft7771 <maxim235@gmx.de> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: GDCloud <93287602+GDCloudstrike@users.noreply.github.com> Co-authored-by: Lyfts <127234178+Lyfts@users.noreply.github.com> Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: Serenibyss <10861407+serenibyss@users.noreply.github.com> Co-authored-by: YannickMG <yannickmg@gmail.com>
2023-07-09Add soft material subtag (#2124)DotJason
* add soft subtag * add soft subtag to Gaia Spirit * clean code style
2023-07-09More quad input hatches (#2121)TheEpicGamer274
* Saving * Saving * Spotless + Import fixes * Attempt to fix review request * Spotless * spotlessApply (#2126) Co-authored-by: GitHub GTNH Actions <> * Fixing Requested Changes * Update src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_QuadrupleHumongous.java Co-authored-by: Maxim <maxim235@gmx.de> * Update GT_MetaTileEntity_Hatch_QuadrupleHumongous.java --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Maxim <maxim235@gmx.de>
2023-07-06Add infused gold bee. (#2119)Alex Bee
2023-07-01stretchy materials (#2097)chochem
2023-06-18Add class for handling external materials (#2089)miozune
2023-06-17restore sodium persulfate chem bath recipes (#2087)chochem
2023-06-16fix volumetric flask (#2086)chochem
2023-06-11fix recipe time and tier to adapt to CBD (#2076)RIONDY 'POPlol333' Adam
* fix recipe time and tier to adapt to CBD * changed to ev * changed to iv
2023-06-11remove duplicate recipes (#2075)chochem
2023-06-11remove iridium exploit (#2074)chochem
2023-06-10Fix spelling mistake for kevlar bee (#2073)Runakai1
2023-06-10fix wrong input amount (#2071)chochem
2023-06-08fix (#2069)Jakub
2023-06-07fix biomass recipes (#2068)chochem
2023-06-07Change Kevlar Parents (#2066)Runakai1
* Change Kevlar Parents Infinity Catalyst and UVH replicator foundation. Will also be blocked from mutatron. * Change mutation chance * Add comment * spotlessApply (#2067) Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-06-07Halve Tin Plasma fuel value and double fusion output (#2060)Daniel Mendes
2023-06-07Remove GT_FluidStack (#2063)miozune
2023-06-05Replace outdated botdustries fluids and fix hydrazine name (#2059)chochem
* use gt++ hydrazine * use gt++ formaldehyde * fix hydrazine name
2023-06-05New Bee, Nerfed Nee (#2058)Runakai1
* New Bee, Nerfed Nee Adds Specialty Palladium comb with 30% to iridium bee. Added "Drake" bee, giving 30% Draconic Comb and 20% specialty awakened drac comb. Needs Awakened coil block as a foundation. (only works in mapiary) Nerfed iTNT bee from 50% output to 20% * missing removed file * Spotless
2023-06-05Code cleanup (#2040)chill
* remove redundant suppressions * prettify commented code * improve comments The integer comment contradicted the code, so I deleted it. * delete commented-out code * update bitwise int flip from XOR to the dedicated tilda operator The flip was a 32-bit XOR, which is an int-flip. That XOR was replaced with an equivalent tilda operator. * convert a field to inline This field was used only once, so put it straight to where it is used. * remove fluid fix since no-one uses Forge version 1355 or earlier * unwrap switches where fitting In some places, we suppress IntelliJ's inspection RedundantLabeledSwitchRuleCodeBlock - we don't want to unwrap some of the suggested cases because we want to keep the consistency in a switch statement for the sake of readability. * fuse "collect" into Stream API * fix javadocs * remove unnecessary public modifiers from an interface Members of an interface are public by default. * move common parts outside of if * suppress OverrideOnly warning in a javadoc * remove unused lock * suppress warnings about unchecked casts These warnings require non-trivial fixes that are yet to arrive. For now, let's suppress them to reduce the warning-bloat. * remove outdated comment * remove final modifier from private methods Because they are private, it is hard to accidentally overwrite them. Therefore, the final modifier is redundant in this case. * refactor getIcon The first 'if' doesn't cover only tMeta == 9 && mConnectedMachineTextures, therefore the second if can be unrolled. The last switch is redundant because all tMeta values are covered by switches, but let's keep SOLID_STEEL as a fallback just in case. * explain what the casings are and why block casings are split * suppress switch-to-if suggestion * remove unnecessary null check The null is handled in doGenerateItem() * address redundant local variables * rename variables in onTick * suppress warning about accessing static member via instance * rephrase exception * rephrase javadoc * address field-can-be-final warnings * remove empty methods * enum cannot inherit, so protected is redundant * remove redundant throws * update imports to be not wildcard * remove unnecessary try-catch * update for loop * remove redundant code in order to use the diamond operator * update instanceof to use pattern variables * replace blank lines with <p> in javadocs * fix dangling javadocs * suppress warning about unreachable methods in javadocs * remove redundant operation * add the descriptions of parameters in javadocs Also fix javadocs along the way. * relax returned type in javadoc That was done in order to make the docs reflect the code more often. Otherwise, people may forget to change the returned type again with another change. * make long conversion explicit Integer multiplication can give a wrong result if one of the parts is not explicitly cast to long. Let's cast one of the parts where applicable. * remove unary plus * simplify unary minus * use addAll instead of forEach,add It was suggested by IntelliJ to replace the iteration with a bulk operation to improve performance. * replace .asList with .singletonList for consistency * simplify toArray calls Explanation from IntelliJ: There are two styles to convert a collection to an array: * A pre-sized array, for example, c.toArray(new String[c.size()]) * An empty array, for example, c.toArray(new String[0]) In older Java versions, using a pre-sized array was recommended, as the reflection call necessary to create an array of proper size was quite slow. However, since late updates of OpenJDK 6, this call was intrinsified, making the performance of the empty array version the same, and sometimes even better, compared to the pre-sized version. Also, passing a pre-sized array is dangerous for a concurrent or synchronized collection as a data race is possible between the size and toArray calls. This may result in extra nulls at the end of the array if the collection was concurrently shrunk during the operation. * split StringBuilder append Explanation by IntelliJ: Reports String concatenation used as the argument to appends. Such calls may profitably be turned into chained append calls on the existing StringBuilder saving the cost of an extra StringBuilder allocation. This inspection ignores compile-time evaluated String concatenations, in which case the conversion would only worsen performance. * annotate overriding methods with @Nonnull where needed The method that was overridden has @Nonnull so the method that is overriding should also have @Nonnull. * remove set adding itself to itself * remove null check because findField either works or blows up cpw.mods.fml.relauncher.ReflectionHelper::findField either returns a non-null value or throws a RuntimeException, so no need to check of null. * remove slot comparison with tInventory.length slot max value is 127 when tInventory.length is set to 256, which results in that the condition is always true and unnecessary. * remove aOutput2 null check As GT_Values.NI is null, there is no need to check aOutput2 for null again * suppress the suggestion to delete tMeta < 13 mConnectedMachineTextures can change, so tMeta range is not guaranteed * remove aCoverVariable % 3 < 2 the if above already limits the result of % 3 to "2", so the condition "less than 2" is always false. * unwrap "if" because bonus is unchanged Unwrap if because even if the bonus is a variable, it hasn't been changed for the past 8 years and is unlikely to be changed in the future. * reformat javadoc * improve ignoring an exception Make them either more clear or concise * fixup fix typo * update deprecated calls of newInstance() * remove testing BaseMetaTileEntity GregTech_API.constructBaseMetaTileEntity() checks the creation by itself, logging and throwing a runtime error if failed. * unwrap hatch-fill for do_SolarSalt To reach this branch, do_coolant needs to be false and we need to still be in the function, which means that do_SolarSalt was set to true in the previous top-tier "if". * remove always-false input-bus checks of MTE PlasmaForge size() is non-negative, and the values it is compared to are final and 0. * length and size are non-negative Therefore, there's no need to check their negativity * aOutput is guaranteed to be positive * tThereWasARecipe is always false when reached in its first occurrence * convert an assert into if Only tStack 2 is checked for null because if it isn't null then tStack1 also isn't null based on the "if" above. Also IntelliJ was sure that tStack is not null for some reason. On a side note, assertions work only either with a specified flag or in debug runs. Therefore, it is dangerous to rely on them. * simplify stone-gravel-cobble if tBlock != Blocks.stone because of the if at the start of the method. for the last else-if, tBlock == Blocks.gravel because of the check slightly above the change. * interDimensional is always true because of the first if * convert an example to javadoc * remove always-false statements * replace referential string equality with equals If we compare strings by "==", we compare references to them, which is not what we usually want. I wasn't sure if String Pool works here, so I played it save with equals(). * use Automatic Resource Management for AutoCloseable ByteBufOutputStream * add todo to swap from sleep to event bus * null is checked by instanceof * merge switch branches * add a TODO to use clamp() * new String declaration is redundant * use getOrDefault for a map * replace StringBuilder with concatenation where fitting Using a StringBuilder to concatenate two string will not make the program faster or more understandable, so I swapped it to concatenation. * remove unnecessary continue * flip if * remove redundant returns * unwrap ifs It's checked at the top "if" that aType == IItemRenderer.ItemRenderType.INVENTORY, so all aType.equals(IItemRenderer.ItemRenderType.INVENTORY below are always true. * remove checking all GT VERSIONs except the API one * remove version check from GT_Mod and delete respective VERSION fields Aside from GregTech_API.VERSION, these fields are not used anywhere in the project, so only GregTech_API.VERSION was kept. The idea and the usage check were done by miozune.
2023-06-05Lower ingot to nugget craft with saw from 9 to 8 (#2056)Daniel Mendes
2023-06-04fix (#2054)BlueWeabo
2023-06-04do optimize explicitly where it matters (#2047)chochem
2023-06-04safe the macguffin (#2050)chochem
2023-06-01Add durability and charge bar visibility config options (#2041)Caedis
2023-06-01add Grate Machine Casing assembler recipe (#2042)DotJason
2023-05-29Final stretch for GT RA2 conversions (#2038)chochem
* (un)boxing RA2 * fuel ra2 * blast RA2 * primitive blast RA2 * remaining cutter ra2 * fix
2023-05-29butcher recipe time (#2033)RIONDY 'POPlol333' Adam
* butcher recipe time * spotlessApply (#2034) Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-05-28make private fields final where possible (#2028)chill
2023-05-22Nerf Sunnarium Bee, Add Endstone to Endstone Bee (#2014)Runakai1
* Nerf Sunnarium Bee, Add Endstone to Endstone Bee Previous sunnarium: glowstone 40% sunnarium 20% now: glowstone 30% sunnarium 5% Added 4 End Stone to comb centrifuging of End stone bee * spotlessApply (#2015) Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-05-20Singleblock machine internal fluid tank scaling standardization (#1999)Pxx500
* chemical reactors * Other machines * More machines and chemical reactors pt2 * standard * fix * Update GT_Loader_MetaTileEntities_Recipes.java * expand fluid scaling --------- Co-authored-by: kuba6000 <kuba.123123.6000@gmail.com>
2023-05-19Cable recipe collision fix (#2009)chochem
* fix missing break * switch to modern switch * more code improvements
2023-05-19Yet another round of ra2 conversions (#2006)chochem
* lathe and saplings * toolhead oreproc recipes * fluid solidification * reverse macerating * autoclave combs * implosion compressor * assembler recipes * assembling line * slicer recipes * minor fixes * attempted cell to fluid fix * minor fix 2
2023-05-19More recipe collision fixes (#2010)chochem
* dont add the same recipe 300 times * have custom vac freezer recipes in GT * have custom vac freezer recipes in coremod
2023-05-18check that fluid is not null (#2004)chochem
2023-05-18Don't add cell recipe for Replicator if dust one is already available (#2005)miozune
2023-05-18a few small fixes (#2003)chochem
* fix snow queen bee drop * fix ismodloaded errors
2023-05-17More RA2 conversion for automatic gt recipes (#2000)chochem
* fully convert all wiremill recipes and clean up unnecessary duplicate code * fully convert all polarizer recipes * fully convert all canner recipes * RA2 for oredict plank recipes * RA2 for oredict stoneCobble recipes * convert some assembler recipes to RA2 * fix * fix2 * remove recipes that were never in the game
2023-05-17Various GT fixes (#2002)chochem
* TE items cant be required * remove from itemlist * TE does not exist * this never worked anyway but also unecessary * these are broken. have a working replacement already * give valid id to fix rockbreaker fake recipes * fix texture and text * no NC its fake anyway
2023-05-16Eternity nanites (#1997)GDCloud
* generate nanite * textures * recipe * timepiece instead * spotlessApply (#1998) Co-authored-by: GitHub GTNH Actions <> * add primordial matter * texture * add recipe * primordial matter instead of uum --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-05-16more Ra2 recipe conversions and some small fixes/improvements in GT recipe ↵chochem
generation (#1994) * oredict plate recipes * oredict dust recipes * ore processing recycling recipes * shaping recipes * more fixes * fixes * 2 fixes * remove unnecessary qualifications
2023-05-15Various GT recipe fixes (#1990)chochem
* null checks for cables * actually fix drillhead recycling * revert old incorrect drill fix * fix netherstar cables
2023-05-14Nerf Phosphorus Bee, Buff Fluid bees (#1985)Runakai1
2023-05-13Next round of Ra2 conversions (#1982)chochem
* process log RA2 * process crop RA2 * process nuggets ra2 * process gear ra2 * process pipe ra2 * unhide leninade
2023-05-12Rhodium plated palladium fix (#1980)chochem
* part 1 * part2
2023-05-12Add Eternity material + Timepiece (#1973)GDCloud
* add eternity * textures * timepiece * disable ebf + freezing
2023-05-12fix sodium fluid (#1977)chochem
2023-05-09adjust rutile amounts (#1970)chochem