Commit Graph
5100 Commits
Author SHA1 Message Date
Richard Freimer c8d2fbbac8 Add comparator support for a large number of blocks (#5474)
* Add comparator support to a lot of various blocks. Closes #5447

* Add comparator support for various generator blocks

* Cleanup some old calculations not using the new utils method
2019-05-13 15:50:02 -04:00
pupnewfster 52796ff18f Only mark the chargepad as active if it has energy. Fixes #5472 2019-05-13 12:57:25 -04:00
pupnewfster ef6e17e377 Don't auto clear configuration card after pasting. Closes #5442 2019-05-13 12:47:18 -04:00
ToMe25 aa1050352b Atomic Disassembler Grass Path Block Tweak (#5471)
* implement #4464

* fix some changed language files

Just fix accidentally uploading old versions of some lang files

* implment a suggested change
2019-05-13 11:49:21 -04:00
Richard Freimer 80b07bc4b3 Code cleanup (#5468)
* remove direct guava predicates from BlockStateMachine

* cleanup blockstatebasic

* fix a large number of e.printStacktrace calls, narrow ComputerIntegration exception signature

* fix simple todos, remove invalid todos, unify some duplicate rendering code

* use a generic method to get around unchecked warning

* remove some redundant uses of hasCapability

* experimental OptionalCapability class. not in use yet

* nullable checks/annotations & remove duplicate field controlType in factory TE

* Inline various redundant variables

* Remove unused list

* Cleanup BlockStateGenerator

* Replace string constants with pointers to the proper mod id constant

* As 9.7.5 breaks backwards compat API wise for the DynamicNetwork this is as good a time as any to remove this deprecated method

* Use two argument constructor instead of appending a ':' inbetween

* Convert other BlockState type classes to using suppliers for tile entity creation
2019-05-13 11:43:42 -04:00
pupnewfster 40620ec23b Fix loading gas tank's with null gas stored. Fixes #5470 2019-05-12 12:39:39 -04:00
Richard Freimer 0d4b50908f Formatting and code readability cleanup (#5467)
* First pass reformatting code to be more readable (common still not done)

* Replace google common collect calls with Java calls where possible

* Remove a bunch of unnecessary parenthesis leaving clarifying ones

* Add some missing @Nonnull annotations

* Fix checking wrong type

* Remove unnecessary continue/return statements and simplify comparision check

* Pass exception instead of directly printing stack trace

* Work on cleaning up common, through config so far

* Work on cleaning up common, through integration so far

* Work on cleaning up common, through network so far

* Work on cleaning up common, through tier so far

* Remove empty constructors that get created by default anyways

* Work on cleaning up common, through transmitters so far

* Work on cleaning up common, through utils so far

* Finish cleaning up spacing for common
2019-05-11 14:13:24 -04:00
Thiakil 91ef2a5c3d add energy storage settings category to config gui. closes #5465 2019-05-11 11:51:09 +08:00
Xander 31b06c0ab0 Keybindings optimisations (#5389)
* Shift keybinds to a builder pattern to avoid the array length issue, use Bitsets for the boolean arrays, remove unused and redundant constructor

* Use proper lang keys for KeyBinding creation instead of pre-localising

* WIP tidy keyhandler tick method

* more key handler tidying

* tweak handler to use translation placeholders so languages can reconfigure the foo: bar display

* add todo

* move tank, bow & flamethrower keys to use string format placeholders

* fix NPE on configurator changes

* nullable annotations

* prefix keybind lang keys with modid

* make datafixers into their own thing

* make a datafixer base class

* remove keybind fixer, options datafixers dont work

* Revert "remove keybind fixer, options datafixers dont work"

This reverts commit c57f6c1b05ed6b26e7fb7774bada4ca53f6c655e.

* datafix the keybinds to the new format

* documentation

* Remove unused import and extra dash from runClient args
2019-05-10 16:58:57 -04:00
Xander b570ef7110 Codestyle (#5463)
* tweak line wrap settings

* codestyle name
2019-05-10 16:50:50 -04:00
Matej Zajo Kralik 352fddbf00 Logistical sorter - single item & muffling upgrade (#5446)
* Add single item functionality, update tooltips

* Wrap tooltips, use prefixes in lang files.

* Fix broken ItemStack sizeMode, code cleanup, gui improvements.

* LogisticalSorter muffling upgrade support

* Code style changes and cleanup, proper translation

* Fix lights on side of sorter
2019-05-10 16:48:11 -04:00
Xander ad47302b26 Cleanup DynamicNetwork API (#5460)
* Change unused map (values) to use a set

* bump api version

* make DynamicNetwork fields non public and weaker type

* remove overhead of a set in CME avoidance

* Minor cleaning
2019-05-10 11:56:22 -04:00
Thiakil 0a9c253f0f skip acceptor if it's TileEntity is null, because the tile has unloaded (reported on discord) 2019-05-06 19:51:18 +08:00
pupnewfster 4d497e23a5 bump version to 9.7.4 2019-05-04 15:21:15 -04:00
Richard Freimer e3161cf2db Miner cleanup (#5456)
* Cleanup readability of firing events

* Minor cleanup of MinerUtils

* Cleanup fallback system for MinerUtils and inline fallbackGetSilkTouch

* restore block drops backwards compatibility

* handle shulker boxes in digital miner

* use fake player in a few more event spots & add helper for getting a block's state for placement

* Change default placement so that logs face upwards
2019-05-04 15:17:12 -04:00
Xander 4c4e88dca5 Improve Itemstack equality checks (#5451)
* fix bad stacking check for Digital Miner. #5449

* map to forge's stack stackability check so caps are accounted for

* check nbt when taking a defined item

* fix bad reference equality check for empty

* Switch sorting to using our stackable method

* Fix bad stack check for robit #5454

* Improve stack compare for robit smelting
2019-05-04 12:59:47 -04:00
pupnewfster 82d62ef96f Fix valid fuel check for Gas Generator. Fixes #5448 2019-05-04 12:37:12 -04:00
pupnewfster da012bcf7d Only rename the dropped item if the TE is nameable. Fixes #5455 2019-05-03 14:09:22 -04:00
pupnewfster 20c426d03e Fix returning simulated IC2 power acceptance as EU instead of J. Fixes #5450 2019-05-03 11:58:24 -04:00
pupnewfster faef15691c bump version to 9.7.3 2019-05-02 11:19:00 -04:00
Richard Freimer d5db11eea3 Port #4952 by @danielzgtg Item drop compatibility (#5384)
* Port #4952 by @danielzgtg Item drop compatibility

* Make the dif slightly easier to read by reordering a couple things

* Extract some of the drop logic into super classes to make it easier to read what is going on

* Add missing Nonnull annotation

* Inline the patched harvest block method

* Remove unneeded listener for BlockBounding and fix bounding blocks being set to air not removing the full thing

* Make it easier to tell at a glance that it passes it as false for willHarvest

* give BlockMekanismSimple a better name
2019-05-02 11:16:26 -04:00
pupnewfster 36d1a9c501 Always request a render update because the rotation may have changed. Fixes #4942 2019-05-01 14:10:48 -04:00
Matej Zajo Kralik 36aa81dcf4 Add support for configuring machine energy storage. (#5418)
* Add support for configurable machines storage.

* Make factories and tooltips use machine storage from config. Renaming.

- Renamed config instance members, to reduce redundancy
- Made machines get Storage and Usage from MachineType
- Other miscellaneous cosmetic changes on the matter

* Update ItemBlockMachine.java

* Tweak factories to always have storage needed to run all processes.

* Add storage config to PacketConfigSync.
2019-05-01 13:15:55 -04:00
ToMe25 14d60702b6 Add some more ore processing compatibility (#5445)
* Add some more Compatibility

* Implement the requested Changes.

* Merged the two Mystical Agriculture Recipe Methods

sorry wasn't seeing that line of your comment

* Added support for BoP and Forestry Gems 

Forestry: Apatite
Biomes O' Plenty: Amber, Amethyst, Malachite and Tanzanite
2019-05-01 12:42:04 -04:00
Richard Freimer b3663a37a9 Emitting logic overhaul (#5422)
* First pass improving performance of EnergyNetwork emitting
Only sends power once per tick per accept now. Lots of comments of design included so that I have a backup of my thought process/solutions if I run into some blocker.

* Optimized implementation slightly, still more to be done

* Cleanup some comments

* Move send energy to acceptor logic to CableUtils
Replace old emit logic in CableUtils with using the newer logic

* Inline getConnections to slightly cut down on number of operations ran

* Fix a couple bugs with targets that have multiple sides
Also improve performance reducing frequency at amountPerChanged needs to be ran

* Improve performance of CableUtils.emit by faking we have one 6 sided target as opposed to having 6 one sided targets

* Allow simulating insertion into the EnergyAcceptorWrapper for IC2

* Fix using wrong value for total acceptor count when acceptors have multiple sides

* Use an EnumMap instead of a HashMap for the Target

* First pass converting gas and fluid network emission to target system

* Improve general fluid and gas emitting using the utility method
Change a couple things to using Sets rather than lists for emitting so that we can ensure each side is only done once.

* Document and cleanup method/variable names of target classes

* Start deduplicating emitting code into a EmitUtils file
Logic for Gas and Fluid emitting fully generic now

* Partially extract how we keep track of the split to make it easier to deduplicate the common code

* Start moving shifting needed to given to the targets themselves

* Use generics to deduplicate a lot of the remaining duplication in the new emitting code

* Fix having broke energy emitting and also further cleanup some code

* Half the number of loops the HeatNetwork does onUpdate

* Fix potentially divide by zero errors

* Deprecate and remove implementations of getAcceptors as it is no longer needed

* Never round up from doubles for sending power stops energy networks going negative.

* Fix more spots where we were accidentally rounding upwards/clamping improperly for energy

* Cleanup impl to use less memory and adjust better as sending if
the possible amount changed/should be adjusted
Also removed the need for a specific IntegerTypeTarget intermediary class

* Cleanup the docs of some of the changed things

* Given tickEmit is private now we already know it is only being called serverside

* Improve documentation slightly and rename a method to be more accurate

* Remove limit on IC2 given it uses doubles as well now

* Rename amountPer to amountPerTarget
2019-04-30 10:25:23 -04:00
Richard Freimer 445556fef7 Use security utils for checking access to teleporter and quantum entangloporter (#5431)
* Use security utils for checking access to teleporter and quantum entangloporter
Also add the security tab to the corresponding gui's

* Ensure tile gets saved when security mode changes
2019-04-30 22:13:25 +08:00
Richard Freimer 075673fc56 Improve Compat with TOP (#5427)
* Make TOP display full capacity of fluid and gas networks. Also fix some capabilities not returning the proper. TOP Gas integration now displays the gas color as well.

* Ensure no repercussions for getting MechanicalPipe's TOP network tanks

* Ensure no repercussions for getting PressurizedTube's TOP network tanks

* Display hydrogen with a slightly incorrect color so TOP renders properly

* Fix dynamic valve having item handler always disabled instead of just when multiblock is not made

* Fix a few itemhandlers that should not be disabled for side == null TOP compat

* Always expose networks buffer instead of local buffer if there is a network
2019-04-30 22:12:43 +08:00
pupnewfster 9692debdcf Fix desync between server and client for personal chest. Fixes #5438 2019-04-27 15:39:29 -04:00
pupnewfster dccc32db85 Check NBT for factory sorting. Fixes #5436 2019-04-27 14:55:34 -04:00
pupnewfster 99977f8814 Properly set the metallurgic infuser to empty, fixes #5439 2019-04-27 13:10:40 -04:00
pupnewfster ba89f446f9 Actually obey the update cache param, and use the more advanced helper method in Container as well 2019-04-26 14:39:40 -04:00
Thiakil f6d3d742e8 Check for null recipe in factory input slot. Fixes #5434 2019-04-26 19:34:02 +08:00
Thiakil 10a7be5f12 IDE assisted Nullable annotations for RecipeHandler 2019-04-26 19:33:26 +08:00
pupnewfster c1832d812e Fix Advanced purifying factory not having the lights be on. Closes #5223 2019-04-23 19:54:27 -04:00
pupnewfster 74e168e3a3 Mark BinRecipe as dynamic. Removes Caliper Air warning closes #5174 2019-04-23 16:26:28 -04:00
ToMe25 fe8233c894 Fix Crash when adding a dot or a E to the Laser Amplifier Delay. (#5430) 2019-04-23 13:13:46 -04:00
Richard Freimer 485ee89591 Fix a few missing fluid color renders for various guis (#5424)
* Fix a few missing fluid color renders for various guis. Fixes #5423

* Deduplicate the gauge drawing code for custom sized embedded gauges

* Fix Industrial Turbine gui rendering using wrong scaled fluid level

* Use GLStateManager for coloring fluid
2019-04-23 13:05:49 -04:00
Richard Freimer 03cc33f501 As we disable capabilities when a side config has them disabled we need to notify the neighbor of an update when a side's config changes. (#5426) 2019-04-22 14:20:40 -04:00
pupnewfster 14bd97e435 Give the CrT mekRecipes command a proper description 2019-04-22 13:42:29 -04:00
Richard Freimer 4a74b95998 Update to 9.7.2 2019-04-20 10:54:47 -04:00
Richard Freimer 3316832070 bump version 2019-04-20 10:52:21 -04:00
Richard Freimer 77d774e55f Particle fixes (#5411)
* Make transmitters return an actual particle instead of the default WHITE
Make fluid tank particle/break particle be the glass wall
Have hit particle for fluid tank and transmitters use the correct tier instead of being basic. Running and Falling particle still displays as the basic tier

* Get actual state for transmitters (gets the proper tier data so that we don't have to manually replace it)

* Fix dif of just imports

* Fix dif of just imports

* query the blockstate directly for the MachineType

* remove incorrect copy-pasted use of FML logger

* remove unnecessary list wrapping

* tidy copied particle code a little and un-inline constants

* use built in singleton rather than immulatble list
2019-04-20 10:45:13 -04:00
Xander 0dba7cb584 use getters & setters for InfuseStorage (#5416)
* use getters & setters for InfuseStorage to prevent type/amount discrepancies

* Fix a few checks when reading from network/NBT

* Fix some spacing I screwed up by accident

* fix metallurgic infuser gui texture for dark gauge
2019-04-20 13:38:41 +08:00
Xander bbcea85fc4 Respect NONE connection mode for Pipe Connections (#5387)
* prevent Out of Bounds exception in factory ItemMeshDefinition

* prevent Out of Bounds error in item stack display name

* Respect NONE connection between pipes. Fixes #4781

* prevent fluid/gas pipes from connecting if their contents arent the same (part 1)

* prevent some case of incorrect network merges that would convert/void a fluid/gas

* Add a way to check if a network is compatible with an buffer
Used for checking the orphan's buffer against the external network

* rename some generic type variables for readability

* introduce BUFFER generic type variable

* Fix missing null check causing new pipes not being able to be added to a network

* More checks for when there is an invalid factory

* bump api version & use a constant for all

* add default method to not break binary compat

* Refresh if a connection exists if a transmitter failed to combine two networks
Fallback to the network's buffer as if we have not saved any data yet the TE's buffer may still be null

* Add a way to get the pipes buffer falling back to the network, rather than doing it from the same method. This ensures that there is no accidental leakage where the count of the buffer matters

* Return a null buffer for pressurized tube buffer if the stack is empty

* Allow merging of networks when they are able to connect again
Visuals still need a minor update to sync the type it should be rendering

* Update network visuals when networks merge

* allow unconnected sides to have their mode set - except logistical transporters which already used that function, they only can un-NONE their unconnected sides
2019-04-20 13:38:14 +08:00
Thiakil e187bc1bb8 Robit teleportation fix. Closes #5415 2019-04-19 22:44:23 +08:00
Thiakil 260b545404 Load Mekanism Tools config before creating the materials so the config actually takes effect. Fixes #5412 2019-04-19 21:58:46 +08:00
pupnewfster a5d9a5a2c1 Fix redstone bug described in #5407 turns out it did have to call markDirtyTransmitters and notifyTileChange was not enough 2019-04-17 12:01:23 -04:00
Richard Freimer 04372a6426 Various fixes to data not loading properly (#5407)
* Cleanup redstone handling of TileEntitySidedPipe
Properly mark the transmitters as dirty if the redstone mode changed during refresh

* Fix not updating tank capacity when loading TEFluidTank from NBT

* Make transmitters fix invalid connections on load

* Address comments and call refreshConnections() directly.
2019-04-17 11:24:44 -04:00
Thiakil 9b70069eaf bump version 2019-04-15 22:12:17 +08:00
Richard Freimer f3fdf00064 Factory recipe check (#5399)
* Fixes null pointer on no recipe found #5392
Compare the recipe against the cache

* Add a few missing secondary input checks

* Don't set the cached recipe when only checking if an item can be inserted
2019-04-15 10:10:16 -04:00