Commit Graph
4366 Commits
Author SHA1 Message Date
Tom Elfring 83f06d6ba2 Fix active block states.
Allowed Thermal Evaporation Controller and Induction Port to have active states.
Allowed Reactor Controller and Reactor Port to have active states.
Disallowed Reactor Focus Matrix to have active states.
Fix issue with Reactor Glass and Reactor Laser Matrix should side render.
2017-07-30 16:18:10 +02:00
Tom Elfring d0f0508a26 Set UP texture reactor controller 2017-07-30 14:40:57 +02:00
Tom Elfring 5d8cf6afc2 Allow texture rotation of Thermal Evap. Controller 2017-07-30 14:30:44 +02:00
Tom Elfring 46350ed609 Use CTM connect_to for connecting blocks 2017-07-30 13:41:30 +02:00
Tom Elfring ec1cf6c9cf Merge branch '1.11' into feature-CTM 2017-07-27 12:20:23 +02:00
Aidan 6b23438c41 Merge pull request #4559 from thommy101/feature-4558
[1.11] Add StorageDrawer compat.
2017-07-26 09:41:16 -07:00
Aidan 59362c7ac9 Merge pull request #4567 from thommy101/issue-4560
Fix config caching of pump, miner and plenisher.
2017-07-26 09:29:11 -07:00
Tom Elfring 341e11da70 Fix config caching of pump, miner and plenisher.
Fixes 4560.
2017-07-26 10:17:00 +02:00
Aidan 2a535733c1 Merge pull request #4562 from christofferson/issue-4560
Fix issue with side configuration not respecting block orientation
2017-07-25 10:23:59 -07:00
Aidan 8245db2e01 Merge pull request #4565 from christofferson/issue-4437
Update Transporter Pathfinder
2017-07-25 10:07:09 -07:00
Chris Anderson 90cf4cea08 Add config caching overrides to TileEntityFactory 2017-07-25 11:06:48 -06:00
Xander 40aa8b2f77 Add Storage Drawer maven 2017-07-25 09:23:52 +02:00
Chris Anderson 39d4985113 Fixes #4437
Add checks to TransporterPathfinder to make sure the current node is able to emit to the side(s) we're about to check.
2017-07-25 00:51:30 -06:00
Chris Anderson ba83e8d357 Fix issue with entities not sending energy on sides correctly 2017-07-24 20:28:07 -06:00
Chris Anderson 62eeb4d548 Merge branch '1.11' of github.com:aidancbrady/Mekanism into issue-4560
# Conflicts:
#	src/main/java/mekanism/common/tile/component/TileComponentConfig.java
2017-07-24 19:11:02 -06:00
Chris Anderson e3de87ff45 Fixes #4560 2017-07-24 19:05:20 -06:00
Tom Elfring 10550f656a Add StorageDrawer compat.
Adds feature #4558
NOTE: This is not needed in 1.12
2017-07-24 20:04:54 +02:00
Tom Elfring c86e1b7c60 Merge remote-tracking branch 'upstream/1.11' into feature-CTM 2017-07-24 11:26:19 +02:00
aidancbrady 77e46985ac Fix crash 2017-07-23 20:58:01 -07:00
Aidan 9b93a56c95 Merge pull request #4498 from christofferson/issue-4492
Fix MCMP ClassCastException and usability
2017-07-23 18:09:51 -07:00
aidancbrady 7db697213c Minor cleanup 2017-07-23 18:02:49 -07:00
Chris Anderson 7ce1ac4d42 Update addMultipartHeader to stop counting ITileNetwork implementations after 2 2017-07-23 19:02:49 -06:00
Aidan 51f6ad5ed3 Merge pull request #4555 from Ricket/ricket-perf1
Performance improvements, pass 1
2017-07-23 17:56:39 -07:00
Richard Carter bc3274825a Some performance-oriented refactoring of TileComponentConfig
Add new type "SideConfig" which is observable, this could come in handy
later.
Add hasSideForData method in componentConfig, which is much more
efficient than calling getSidesForData().contains.
Refactor duplicate calls to getConfig into single instances. getConfig
is a nontrivial method.
2017-07-23 20:14:34 -04:00
Richard Carter dc6312e1d3 TileEntityAdvancedBoundingBlock calls getInv twice as much as needed
getInv is a non-trivial getter and doesn't need to be called twice in
all of these methods. Refactor the methods to only call it once.
2017-07-23 20:14:34 -04:00
Richard Carter a9b023a6b2 acceptEnergy/pullEnergy: return 0 if machine is full or empty
Prior to this change, the machines always updated their energy, which
involved a side check and a chunk markDirty; even if the machine is
receiving or giving 0 energy.
Right upfront, check if the machine needs no energy or has none to give,
and if so return 0.
I observed greatly increased server tick performance after this change.
2017-07-23 20:14:34 -04:00
Richard Carter 0c0411979d Add sideIsOutput and sideIsConsumer methods
getOutputtingSides and getConsumingSides both have to construct an
EnumSet, but most usages only immediately call contains() on the EnumSet
and then discard it. Improve performance by adding a method that can
test a side and return a boolean, avoiding the EnumSet creation.
2017-07-23 20:14:34 -04:00
Richard Carter 491a03cf63 TileEntityFluidTank: call getTileEntity once, not twice
Another tiny performance improvement. Showed up when profiling.
2017-07-23 20:14:34 -04:00
Aidan b7b1e5b6bf Merge pull request #4552 from thiakil/issue-4539-thiakil
Fix handling of consumable item fluid containers.
2017-07-23 16:55:45 -07:00
Chris Anderson 8d55f5996b Refactoring multipart packet routing
* Added addMultipartHeader to MultipartTileNetworkJoiner to determine whether a header is needed and add it if necessary
 * Moved individual header addition in transmitter implementations to TileEntitySidedPipe
2017-07-23 15:56:22 -06:00
Xander 3815945d1e Fix handling of consumable item fluid containers.
Fixes #4539.
Also added some null checks.
2017-07-23 12:50:43 +08:00
aidancbrady 46367a445e Merge branch 'master' into 1.11
* master:
  Replace 'toRemove' pattern with Iterator.remove() calls
2017-07-22 20:55:15 -07:00
Aidan df711d11a5 Merge pull request #4278 from Lignum/master
Use Iterator.remove() instead of quirky workarounds + LinkedList usage
2017-07-22 20:54:26 -07:00
Aidan f590af2e04 Merge branch 'master' into master 2017-07-22 20:54:20 -07:00
Aidan 80780dd6d2 Merge pull request #4545 from thommy101/feature-3808
[1.11] Add disable toggle to freerunners.
2017-07-22 20:53:29 -07:00
Aidan 8d3f9a2297 Merge branch '1.11' into feature-3808 2017-07-22 20:53:20 -07:00
Chris Anderson 4691f83274 Add JavaDoc to MultipartTileNetworkJoiner 2017-07-22 21:47:10 -06:00
Chris Anderson 5051186918 Merge branch '1.11' of github.com:aidancbrady/Mekanism into issue-4492
# Conflicts:
#	src/main/java/mekanism/common/block/BlockGlowPanel.java
#	src/main/java/mekanism/common/block/BlockTransmitter.java
2017-07-22 21:35:13 -06:00
Aidan dbb86e344d Merge pull request #4523 from thommy101/issue-4513
[1.11] Update BuildCraft API to maven dependency
2017-07-22 20:32:49 -07:00
aidancbrady f3b4909be9 Revert "Fix handling of consumabe item fluid containers."
This reverts commit 9106ac94a7.
2017-07-22 20:26:58 -07:00
aidancbrady 8145088c45 Cleanup 2017-07-22 20:16:48 -07:00
Aidan 731ad5c425 Merge pull request #4550 from thiakil/issue-4484
ISidedInventory sanity & UsernameCache safety
2017-07-22 20:07:19 -07:00
Aidan 4a7b457bfc Merge branch '1.11' into issue-4484 2017-07-22 20:07:08 -07:00
Aidan 7b1e965509 Merge pull request #4544 from thommy101/issue-3613
[1.11] Add multiblock structures to cardboard blacklist.
2017-07-22 20:05:31 -07:00
Aidan cb675a9e5d Merge pull request #4543 from thommy101/issue-3802
[1.11] Make empty containers stackable.
2017-07-22 20:03:39 -07:00
Aidan d6892677c1 Merge pull request #4547 from thommy101/feature-3807
[1.11] Add bin drops directly to player inventory.
2017-07-22 20:01:29 -07:00
Aidan 243505c127 Merge pull request #4551 from thommy101/issue-4539
[1.11] Fix handling of consumable item fluid containers.
2017-07-22 20:00:06 -07:00
Aidan 34847c8c15 Merge pull request #4549 from thommy101/issue-3534
[1.11] Fix TE access from ChunkCache.
2017-07-22 19:58:03 -07:00
Aidan 82c30dd2eb Merge pull request #4537 from thommy101/issue-3647
[1.11] Add max energy to tooltips
2017-07-22 19:54:49 -07:00
Tom Elfring 9106ac94a7 Fix handling of consumabe item fluid containers.
Fixes #4539.
Also added some null checks and fixed some compiler warnings
2017-07-22 14:40:02 +02:00