Age | Commit message (Collapse) | Author |
|
|
|
* obliterate RA1 (1/2)
* fix wrong recipe map
* guard clauses
* null check
* spotless apply
* redo null check properly
* update BS
---------
Co-authored-by: chochem <40274384+chochem@users.noreply.github.com>
|
|
|
|
|
|
Panels (#2289)
* Adds several UI elements to multiblock drills
* Adds metrics transmitter cover and associated sensor card
* Fixes item icons and item name
* Adds tooltips for adv. sensor card and metrics panel, fixes card/overlay icons, adds recipe for metrics cover
* Refactor cover tab sync to send much smaller ISerializable payloads
* Remove unused variable
* Additional master merge cleanup
* Adds interface for custom metrics export, adds oil drill support
* Adds support for metrics covers retaining attached machine name for tooltip, metrics
* * Adds discrete coordinates to Metrics Cover data
* Adds machine to advanced sensor card tooltip
* Adds cycle time and minimum energy hatch tier to multiblock ore drill tooltips
* Moves many tooltip strings to i10n
* Remove old GT_DisabledWhileActiveButton.java file that crept in during a messy merge
* Spotless
* Improve oil and ore drill metrics, more i18n
* Addresses PR review concerns, adds more situations for self-destructing sensor cards
* Remediates further PR concerns
|
|
* Less aggressive System.nanoTime()
* Address reviews
|
|
* Deprecate GT_RecipeBuilder#noXXXYYY methods
* Remove existing references
|
|
|
|
* Adds item and charging info to Locker WAILA panel
* Refactor Locker WAILA tip entries to happen more on client side
|
|
|
|
|
|
* Implement Stream<FindRecipeResult> findRecipesWithResult for GT_RecipeMap
* Change ProcessingLogic.process to actually use new findRecipesWithResult
* Change ProcessingLogic.process to start finding something only for OUTPUT_FULL result
* Refactor ProcessingLogic.process to make logic more readable
* Replace while with for loop, remove NOT_FOUND return in end of findRecipesWithResult
* Apply spotless
* Make findRecipe use findRecipes, add annotation to GT_Recipe and FindRecipeResult for processRecipe and make method protected, replace wildcard imports
* Remake isRecipeWithOutputFullFound
* Add @Nonnull to methods
* Apply spotless
* Remove Stream version of findRecipeWithResult, replace with predicate one. Add GT_Predicated_Recipe_Map class for utilizing this method. Changes some existent recipe maps to inherit from base class.
* Remove GT_Predicated_Recipe_Map, add Predicate directly to GT_Recipe_Map#findRecipeWithResult. Add AdvancedRecipeValidatorPredicate and FindRecipeWithAdvancedValidatorResult to allow store validation calculations for further use and proper errors displaying.
* Fix InsufficientVoltage errors
* Changes according to review comments. Integrate FindRecipeWithAdvancedValidatorResult to FindRecipeResult, rename AdvancedRecipeValidatorPredicate, encapsulate AdvancedRecipeValidatorPredicate fields, fixes some typos, etc
* Moves InsufficientVoltage check to GT_ParallelHelper. Removes FindRecipeResult#State#INSUFFICIENT_VOLTAGE
* Return an old findRecipeWithResult
* Renames things, call old methods for singleblocks
* Renames things, makes FindRecipeResult ctor private
* Apply spotless
* Move RecipeValidator, fix comments typos
|
|
|
|
|
|
* fix PCB Factory not applying its roughness multiplier when it doesn't do any overclocks
* spotless
|
|
(#2254)
|
|
actual effects (#2244)
* Update redstone buttons and tooltips to better reflect actual use
* Spotless Apply
* Update GT_Cover_FluidRegulator.java
* Update GT_Cover_FluidRegulator.java
* Typo fix, Icon Improved and interactive blocking ui
- Fixed a typo in the world machine
- Fixed double button situation for conveyor belts.
- There was never any issue, the testing methodology gave me invalid results.
- Conveyor behaviour is in line with all the other covers affected by this PR/Branch.
- Updated icon for the machine state to be a miniature machine controller cover.
- Made the block/allow input section more interactive in order to better reflect the actual effect of these buttons.
- In import mode, it actually blocks the machine from outputting from that side.
* typos
I can't write to save myself sometimes
* Better text alignment
- Better text alignment
* fix typos
I swear I can't write to save myself.
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
|
|
|
|
certain parallel (#2225)
* fix overclock calculator calculating eu/t use for ulv recipe wrong on certain parallel
* make formula into its own method
|
|
* Fix recycler blacklist being sensitive to NBT
* Blacklist AE2FC drop and packet, and Chisel stones
* fix class loader issue
|
|
* fix PAs overclocking ulv recipes too much
* make sure we save the returned value
|
|
|
|
|
|
|
|
(#2190)
* fix overclock calculator making too many parallels and wrong eut consumptions
* fix duration increase when trying to do a noOverclock calculator
* spotless
* add correct api for no overclock
* address review
|
|
* Made Emit Energy button a CycleButtonWidget
* Made Emit Redstone button a CycleButtonWidget
* Made Invert Redstone button a CycleButtonWidget
* Made Stocking Mode button a CycleButtonWidget
* Spotless apply
* Made Invert Filter button a CycleButtonWidget
* public bInvertFilter -> protected invertFilter
* Deduplicated filter code
* Made Allow NBT button a CycleButtonWidget
* Made Ignore NBT button a CycleButtonWidget
* public bNBTAllowed -> private allowNbt
* public bNBTAllowed -> private ignoreNbt
* Grey extended tooltips
* Don't hardcode multiline tooltips
* Document hidden functionality
* Cleaned numeric constants
* Fixed string constant declaration
* Named constants in filter
* Unify filter redstone behavior
* Fix cover filter mode being inverted
so that the displayed mode is the active one
* Less magic numbers
* Allow right clicking recipe filter
* Display only machine type in recipe filter and cycle through compatible machines
* Buffer tooltips show output voltage to clarify their role as passthroughs
* Added more info to Emit EU/Redstone buttons
* Added Sorting mode button to buffers/filters
* Added Sorting mode button and stack limit button to input buses
* Don't cycle prefixes when clicking with itemstack
* Fixed tooltips to work off of the inventory
* Fix RecipeFilter losing filter
* Support multiblock machines
* Use ModularUi syncers to sync state with client
Thanks minecraft7771!
* Grey text for recipe filter helper text
* AnimatedTooltipHandler -> EnumChatFormatting
* Explicited RecipeFilter filter building
* Specify color for empty slot tooltip
* Don't cache new uses of GT5U.MBTT.MachineType.
Also corrected MachineType::description
* Removed unused getItemExtraTooltip
* Multiple returns in getItemStackMachineRecipeMap
|
|
* refactor OC calc
* somewhat refactor parallel helper
* fix PA not OCing correctly
no clue why it wasn't using super and then setting the duration again.
* make use of new api to make fusion cleaner
* make batch mode actually dynamic
* add another reason for 0 parallel
* move variables around to try and group them together
* address reviews
* add overclocking past 1 tick by adding parallels
* add null check and make a basic calculator to prevent npe
* check null recipeMap supplier
* address reviews
* addressing of reviews
* make it possible to call some OverclockCalculator methods through static methods
* address reviews
* make sure one doesn't get too many OCs when calculatin under 1 tick
* add api for custom duration under one tick and fix batch mode doing 0 ticking
* fix not calculating duration under 1 tick correctly
* spotless
* try to have correct eut consumption
* address review
* make sure mk5 fusion is said in nei
* fix eutCalculating under one tick way too much and address reviews
* remove roundUp voltage
|
|
|
|
chanced recipes (#2130)
* better calculation
* roll for each parallel
* skip rolling for recipes with chance at 100%
* address not setting as null when stcksize is 0
|
|
|
|
|
|
* Exposed recipe consumption via method
|
|
* Migrate fusion to generic processing logic
* Adjusted OC calculator to allow max number of OCs
* Fixed typo
* Fix buffer consumption logic
* Fix oversight
* Addressed reviews
|
|
on normal parallels (#2147)
* fix
* make sure normal parallels are ran before batch mode
|
|
* 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>
|
|
|
|
|
|
|
|
* default color changes
* add colored casing amount builders
* oversight
* address reviews
|
|
* Added enumeration for check recipe result
* Rework processing logic to work with MTEs too
* Switched first few multiblocks to new checkRecipe method
* Applied generic logic to EBF
* Added support for long power base and applied generic processing logic to more machines
* Address some feedback
* Added more setter to further configure the processing logic
* Change internal checkRecipe to work with checkRecipeResult, to allow the injection of custom failure messages
* Suppress warning, change access
* Merge recipeMap and mapSupplier
* Move calls to setMetaTEController and setRecipeMap to base classes
* Make processingLogic final
* Make results non-null
* Rename `ProcessingLogic#checkRecipe` -> `#validateRecipe`
Otherwise it's confusing with `GT_MetaTileEntity_MultiBlockBase#checkRecipe`
* oops
* Added recipe locking to generic processing logic
* Rename: getWorldObject -> getIHasWorldObjectAndCoords
* Annotate missing overrides
* Renamed recipeLockableController -> recipeLockableMachine
* Migrated Cleanroom
* Migrated pyrolyse oven
* Migrated driller
* Migrated charcoal pit
* Migrated DT
* Rename: controller -> machine
* Make recipemaps override base `findRecipe` and mark others final
* Remove unused maps
* Add FindRecipeResult
* Remove IHasWorldObjectAndCoords parameter from findRecipe
This removes argument for printer recipemap to pass for GT_ModHandler.getAllRecipeOutput, but I don't think there's any mod that adds world-specific coloring recipe.
* Added method to set processing logic power so machines can override it on demand
* Restructure CheckRecipeResult, show voltage required and move package
* Reword: insufficient voltage -> power
* Change text color: dark gray -> gray
* Added findRecipeResult for insufficient heat
* Migrated PCB factory
* Fix result not being reset on shut down
* Show coil tier for heat
* clean
* Reverted migration of driller base
* Migrated TPM
* Moved getting of parallel supplier, to accomodate TPM
* Migrated power gen multiblocks
* Migrated Assembling Line
* Migrated fusion
* Migrated multi smelter
* Migrated boiler
* Migrated DTPF
* Migrated ore factory
* Migrated heat exchanger
* Make checkRecipe() final, javadoc, minor cleanup
* Fix overclock behavior with multiple hatches, javadoc, minor cleanup
* Minor fix for javadoc
* Fixed creation of OC calculator not factoring in batch mode correctly
* Make GT_ParallelHelper#setRecipe nonnull
* Rework SimpleCheckRecipeResult to not require registration
* Migrate charcoal pit and cleanroom
* Fix result not being reset when turning off machine
* Add API for BW to make recipemap sensitive to special slot on recipe search
* Migrated PA
* Migrated driller base
* Make ProcessingLogic#duration int
* Minor cleanup
* missing recipe locking for long multi
* Fix NPE
* Show crash message and turn off machine
* minor javadoc fix
* Fixed power setting for extended power base
* Integrate SingleRecipeCheck into ProcessingLogic, fix duration overflow, fix duration for batch mode, migrate PA for GT_MetaTileEntity_ExtendedPowerMultiBlockBase
* Fixed ME stocking busses
* Minor PA fixes
* Cleanup item collecting logic & apply to normal multi as well
* Oversight
* Derp
* Multiple voltage instead of amperage with recipe map amperage, since usually amperage is intended for parallel, not for recipe checking
* Fix missing EU modifiers on PCB factory OC calculator
* Removed left over OC method
* Fixed duration calculation of PCB not applying roughness multiplier
* Fixed OC parameters
* Make createOverclockCalculator nonnull & more nonnull annotations
* Fixed input processing voltage
* Round down voltage for other machines too
* Revert Nano Forge, return correct long voltage
* Use region / endregion
---------
Co-authored-by: miozune <miozune@gmail.com>
|
|
|
|
* Added null checks to single recipe check saving
* Removed left over brackets
|
|
* Fix Precision
This increases the maximum amount of temperature upgrades from 8 to 10 while halfing the amount of temperature boost they give to allow for more precision. Previously you were not able to simulate a warm biome in normal/normal. Doubles Boost, halfes energy consumption.
* increase to 16
|
|
|
|
* Fix missing copy call for fluid recipe builder
* maybe this needs copy as well?
|
|
|
|
|
|
|
|
|