Commit Graph
933 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
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
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
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
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
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
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
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 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 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
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
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
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
Thiakil c195cd6bbb null pointer fix for #5388 2019-04-13 11:54:40 +08:00
Dave Smith 8bc38d47a7 Avoid scheduling a sound to be played if it's fully muffled. (#5386)
* Avoid scheduling a sound to be played if it's fully muffled.

* Remove debug message
2019-04-12 12:50:54 -04:00
Richard Freimer da71637053 Port ToMe25's PR for sawing factories (#5383)
* Port remainder of #5327 implementing #5236 sawing factories

* Add missing blockstate files for sawing factories

* Inline helper method

* Revert a bit of minor formatting changes to make dif easier to read

* remove redundant mcmeta for sawing front textures

* de-dupe sawmill factory textures (left+right are the same)
2019-04-12 10:22:16 -04:00
pupnewfster fcef0e2ed4 Fix logistical transporters attempting to connect to chargepads 2019-04-11 11:21:00 -04:00
temp1011 7ae0a4d5ca port tesr pull (#5380)
Logistical Sorter & Chargepad TESR to model improvements
2019-04-11 20:27:46 +08:00
pupnewfster d6a0d989e0 Fix JEI error from a circular enum dependency 2019-04-10 21:26:18 -04:00
Richard Freimer 9d98ef575d Port config rewrite (#5378)
Port Config system, Remove some unused code, Refactored various Tier enums out into their own package
2019-04-11 07:18:59 +08:00
Richard Freimer a1e0688af8 Make many more Mekanism fluid renderers Stack aware for NBT purposes (#5360)
* Port 72251446f make many more Mekanism fluid renderers Stack aware for NBT purposes

* Make it a bit easier to see osmium in the compressor

* fix a missed stack color get

* move osmium gas colour back to a more vibrant blue for contrast reasons
2019-04-10 10:12:45 -04:00
Richard Freimer 88eae4f314 Port a couple missed commits (#5376)
* Port d303295da Move all version number references to gradle based

* Port ebb0c467717 dont set main multiblock position to air if its not loaded or not the right tile. Log if its not null but not what we expect

* Fix compile error
2019-04-09 22:39:06 -04:00
Richard Freimer 1e5e853241 Disable some capabilities in missed spots (#5364)
* Don't expose item handler in spots there are never slots accessible.
Change Oredictionificator to be accessible on all sides except the front
2019-04-09 00:38:16 -04:00
Richard Freimer 4ea79c529c Port a7fbfff75 fix energy cubes missing the spinny cube on load/enter-area (#5359) 2019-04-08 13:19:13 -04:00
Richard Freimer a3ae18703b Port factory insertion (#5346)
* Port dfd5252cd and improve factory auto sort performance
* Fix comparing against wrong item causing being unable to insert into factory at all
* Only auto sort into a slot if the recipe output will stack with the current output
* Make factory slot insertion obey changes to checking output items as well
2019-04-08 10:59:29 -06:00
Dave Smith 9456b68529 Introduce bounds to search for sparkles! (#5343)
* Address c368692a3; create upper bound on number of blocks scanned and reduce memory utilization

* Final cleanup on sparkle overhaul; all multiblock structures should now sparkle in < 1ms on average

* Remove timing info; either enable sparkles or the message (not both)
2019-04-07 22:43:17 -04:00
Thiakil 6e3b3fcf56 Change thermal evap controller check to not recurse. Fixes #5334 2019-04-08 10:03:03 +08:00
Aidan 17708ce587 Fix TransporterStack home locations & DM inventory interaction (#5335)
* Fix DM charge slot inventory interaction, fixed TransporterStack home paths

* Added clarification comment to JavaDoc for canBeCharged/Discharged
2019-04-07 19:16:25 -04:00
pupnewfster 41d4db1b4c Port d8fa091c5 dont do distance calculation when teleporting between dimensions 2019-04-05 18:14:14 -07:00
pupnewfster 6a1657eaa6 Fix some desync in data between server and client active states of blocks 2019-04-04 11:23:40 -04:00
Dave Smith 32eccdec9c Rename all Mekanica -> Mekanism 2019-04-03 10:50:13 -07:00
aidancbrady 6a0f8e386d Fix #5329
Check against homeLocation when finding TransporterStack acceptors; also, don't allow inventory insertion/extraction of things in charge slot for Digital Miner
2019-04-02 20:16:11 -04:00
pupnewfster 97421bd7dd Fix dupe bug caused by the offset capabilities 2019-04-02 12:50:14 -07:00
pupnewfster ed9dedd39c Remove a lot of the unchecked cast warnings around capabilities 2019-04-02 12:50:14 -07:00
pupnewfster 66d0bca37c Remove usage of TUBE_CONNECTION_CAPABILITY, in favor of using toggleable capabilities 2019-04-02 12:50:14 -07:00
pupnewfster c9f4a90dba Allow bins to be accessed from all sides 2019-04-02 12:50:14 -07:00
pupnewfster 5cf9551123 Add some JavaDocs to the new Capability Interfaces 2019-04-02 12:50:14 -07:00
pupnewfster 8c102b85c2 Implement isItemValid check for BinItemHandler (only is true for slot 0)
Also have the custom interfaces extend ICapabilityProvider
2019-04-02 12:50:14 -07:00
pupnewfster cf8ef8ad5f Move configuration capability checking from CapabilityUtils to TileEntityComponentConfig 2019-04-02 12:50:14 -07:00
pupnewfster 5822c3ce69 Disable capability for a couple other tiles 2019-04-02 12:50:14 -07:00
pupnewfster 1f5353bd04 Obey the configuration tabs of various machines 2019-04-02 12:50:14 -07:00
pupnewfster b8ae59286e Better handling of if energy should be allowed to connect 2019-04-02 12:50:14 -07:00