Commit Graph
2564 Commits
Author SHA1 Message Date
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
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
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 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
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
Xander 7bf8fedb37 add a log message the first time a username lookup fails 2017-07-21 21:24:12 +08:00
Xander a39d624545 minor fix for log message; return the size of the list we're checking against 2017-07-21 20:46:59 +08:00
Xander a5e816dddc Add util method to get Username from UUID, without nulls 2017-07-21 20:35:41 +08:00
Tom Elfring 4614c67750 Fix typo 2017-07-21 12:47:38 +02:00
Tom Elfring 7c1e8b9f81 Change TE access from ChunkCache to Util method 2017-07-21 12:43:39 +02:00
Tom Elfring 65084f567b Fix TE access from ChunkCache.
Fixes #3534
2017-07-21 11:21:41 +02:00
Tom Elfring 0a1da00913 Add bin drops directly to player inventory.
If there's no space, drop them in front of the bin.
Adds feature #3807
2017-07-19 19:00:33 +02:00
Tom Elfring 6f78c19cb2 Add disable toggle to freerunners.
Adds feature #3808.
2017-07-19 15:15:35 +02:00
Tom Elfring 6ba975b84f Add multiblock structures to cardboard blacklist.
Fixes #3613
2017-07-19 11:57:26 +02:00
Tom Elfring b24cbb797a Make empty containers stackable.
Makes Cardboardboxes, gastanks and fluidtanks stackable. Bins are already stackable.
Fixes #3802
2017-07-19 11:33:17 +02:00
Xander Victory 5f2501693f add a sanity check for weird ISidedInventorys that give us a slot id that's higher than the inv size they reported. (see #4484) 2017-07-18 17:12:28 +08:00
Tom Elfring f6c126af44 Add max energy to tooltips 2017-07-17 20:27:05 +02:00
Aidan b3f1a9fee4 Merge pull request #4529 from thommy101/issue-4508
[1.11] Fix missing null itemstack in InventoryPersonal.
2017-07-17 08:54:14 -07:00
Aidan d00224f7a6 Merge pull request #4530 from thommy101/issue-4510
[1.11] Different factory issues.
2017-07-17 08:53:20 -07:00
Aidan 901694bb26 Merge pull request #4534 from thommy101/issue-4527
[1.11] Fix logistical sorter handling with less than full stacks.
2017-07-17 08:50:16 -07:00
Aidan eb37d312aa Merge pull request #4535 from thiakil/imc-recipes
Use FMLInterModComms.IMCEvent to process IMC messages
2017-07-17 08:49:14 -07:00
aidancbrady 672ec6ad2f Clear comments 2017-07-17 08:48:01 -07:00
Tom Elfring b886d39866 Fix wrong cast BC integration 2017-07-17 15:36:00 +02:00
Tom Elfring f9c6dc011b Fix conversion rate BC-RF-Mekanism 2017-07-17 15:30:19 +02:00
Xander 5f877bc2c1 Comment out certus/fluix oredict crusher/enrichment recipes - Applied Llamagistics adds its own via its configurable recipe system. 2017-07-17 21:12:16 +08:00
Xander 664b07ab54 register power transmitter for FE tunnel, which will (almost) always be there. Should still connect to EU tunnel, but makes more sense to attune to FE 2017-07-17 21:10:14 +08:00
Tom Elfring 84271c04d9 Cleanup getMaxEnergy 2017-07-17 14:44:38 +02:00
Xander 402457cf0d Use FMLInterModComms.IMCEvent to process IMC messages, arrives between Init & PostInit. Allows JEI to display changed recipes. 2017-07-17 20:09:26 +08:00
Tom Elfring 768019c03f Fix logistical sorter handling with less than full stacks.
Fixes #4527
2017-07-16 20:12:48 +02:00
Tom Elfring f1e273ff5f Fix getMaxEnergy for factories.
Fixes pickBlock and dropped block max energy from being limited to 0.
2017-07-16 19:42:06 +02:00
Tom Elfring cc1320c71f Fix smelting factories default max energy value.
Adresses #4510
2017-07-14 20:02:46 +02:00
Tom Elfring 36da1bc1d0 Fix missing null itemstack in InventoryPersonal.
Fixes #4508
2017-07-14 19:12:24 +02:00
Tom Elfring 16d2ef3960 Fix wrong BC value 2017-07-10 19:02:02 +02:00
Tom Elfring a32824a434 Update BC to a maven dependency 2017-07-10 18:56:31 +02:00
Tom Elfring 3cfe0ee0d6 Add missing null structure check.
Fixes #4522
2017-07-10 18:27:41 +02:00
Tom Elfring e860089535 Update BuildCraft API to 218FB4A 2017-07-10 18:19:00 +02:00
Aidan 5e17742c45 Merge pull request #4494 from thommy101/issue-4483
Update entity names.
2017-06-29 11:15:53 -10:00