Commit Graph
2141 Commits
Author SHA1 Message Date
aidancbrady 36602926dd Customizable Quantum Entangloporter energy transfer rate 2017-08-09 11:50:44 -07:00
Tom Elfring a4958ae8c9 Temp-fix quantum entangloporter and fix ThermoConductor losing tier
Fixes #4605
Fixes #4606
2017-08-09 19:39:06 +02:00
Tom Elfring 29615cc6a9 Merge branch '1.11' of github.com:aidancbrady/Mekanism into 1.11 2017-08-07 20:00:52 +02:00
Tom Elfring 2e38fb9748 Fix some mod integrations not working.
Moved all mod id definitions to a constant value in MekanismHooks.
Fix integration with ComputerCraft, OpenComputers and IC2.

Fix #4603
2017-08-07 19:59:32 +02:00
aidancbrady 7b9bf21942 Added full-fledged JEI ingredient support for Mekanism gases. Thanks to @mezz for making this possible 2017-08-06 13:09:45 -07:00
Xander 5ef8cf367c add a couple of comments [no-ci] 2017-08-06 09:34:58 +08:00
Xander aabcd0d77a add Anchor Upgrade to Entangleporter 2017-08-06 00:18:39 +08:00
Xander 81e56b207c Store Quantum Entangleporter frequency (name and public/private only) in the itemstack when dismantled. Displayed in the sneak key info tooltip. 2017-08-05 22:49:50 +08:00
Xander 7b3f4e8e2a Increase Entangleporter frequency to be able to store as much as ultimate tiers can transmit. 2017-08-05 21:44:51 +08:00
Xander 45b48600d0 static field access to Class access 2017-08-05 21:01:42 +08:00
Tom Elfring 7e43e1a628 Add more recipes to colourd blocks (1.11) 2017-08-05 12:52:31 +02:00
aidancbrady d38d519238 Fixed crash 2017-08-02 20:54:17 -07:00
Tom Elfring 1de4ebf67a Merge remote-tracking branch 'upstream/1.11' into feature-CTM 2017-08-01 19:52:30 +02:00
aidancbrady ebb7ca9c7b Cleanup 2017-08-01 10:41:31 -07:00
Aidan 69b39c6bea Merge pull request #4426 from PlayerWithoutName/evaporatorFix
Fixed evaporator liquid rendering
2017-08-01 10:39:39 -07:00
aidancbrady 603d8d5b02 Bump version 2017-08-01 10:12:49 -07:00
aidancbrady 60317be794 Fixed Formulaic Assemblicator bucket issue, attempt to maven-ize IC2 2017-08-01 09:41:48 -07:00
aidancbrady 5bd67b37b2 Fixed IC2 integration 2017-07-31 19:41:24 -07:00
aidancbrady 9801b12b62 Fixed the horrible transmitter issue (spec: DynamicNetwork:215-218)
Also, fixed client render update delay
2017-07-31 18:38:46 -07:00
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 5d8cf6afc2 Allow texture rotation of Thermal Evap. Controller 2017-07-30 14:30:44 +02:00
aidancbrady 6ef08e90f1 Another cleanup 2017-07-27 09:33:09 -07:00
Tom Elfring ec1cf6c9cf Merge branch '1.11' into feature-CTM 2017-07-27 12:20:23 +02:00
aidancbrady 48c748e55e Kill off some unused code 2017-07-26 14:04:26 -07:00
aidancbrady edf0fe1a38 Updated minor compat 2017-07-26 12:42:56 -07:00
Aidan 6b23438c41 Merge pull request #4559 from thommy101/feature-4558
[1.11] Add StorageDrawer compat.
2017-07-26 09:41:16 -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
Chris Anderson 90cf4cea08 Add config caching overrides to TileEntityFactory 2017-07-25 11:06:48 -06: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
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
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 f590af2e04 Merge branch 'master' into master 2017-07-22 20:54:20 -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