100 Commits
Author SHA1 Message Date
Chris f7a5d31f60 Branching 2018-05-21 22:54:39 -04:00
Chris b80a81658f Changelog catchup 2018-05-21 22:52:07 -04:00
Chris 2b7c0a73ee Version bump 2018-05-20 04:51:46 -04:00
Chris 01473add45 Rewrote how item extraction is performed for the arcane terminal.
Fixes #342
Fixes #340
2018-05-20 04:50:00 -04:00
Chris b1ea598cbb Its just never good enough for Sonar 2018-03-27 21:18:46 -04:00
Chris 1b6c63ccff Sonar! 2018-03-27 21:12:13 -04:00
Chris 268366799b More sonar fixes 2018-03-27 21:06:01 -04:00
Chris 53d978c49b Sonar fixes 2018-03-27 20:19:30 -04:00
Chris McGhee b000d1af10 Update README.md 2018-03-27 01:09:06 -04:00
Chris McGhee 22b5e818f3 Update README.md 2018-03-27 01:07:57 -04:00
Chris f778039dbd Resolved potential null exceptions
Removed ambiguious equals()
Removed redudant null check
Reworked tryGetSource
Fixed issue where a weak reference was being null checked, instead of what it was referencing.
Condensed if checks with same result.
Fixed #339: Relay interfaces can no longer recurse and cause a stack overflow.

Closed sonar issues:
https://sonarcloud.io/project/issues?id=thaumicenergistics%3AThaumicEnergistics&issues=AWJQx-IzgrzAwlaaz8TL&open=AWJQx-IzgrzAwlaaz8TL
https://sonarcloud.io/project/issues?id=thaumicenergistics%3AThaumicEnergistics&issues=AWJQx-LlgrzAwlaaz8aJ&open=AWJQx-LlgrzAwlaaz8aJ
https://sonarcloud.io/project/issues?id=thaumicenergistics%3AThaumicEnergistics&issues=AWJQx-NzgrzAwlaaz8ey&open=AWJQx-NzgrzAwlaaz8ey
https://sonarcloud.io/project/issues?id=thaumicenergistics%3AThaumicEnergistics&issues=AWJQx-N6grzAwlaaz8fC&open=AWJQx-N6grzAwlaaz8fC
https://sonarcloud.io/project/issues?id=thaumicenergistics%3AThaumicEnergistics&issues=AWJQx-L1grzAwlaaz8a4&open=AWJQx-L1grzAwlaaz8a4
https://sonarcloud.io/project/issues?id=thaumicenergistics%3AThaumicEnergistics&issues=AWJQx-MvgrzAwlaaz8cw&open=AWJQx-MvgrzAwlaaz8cw
https://sonarcloud.io/project/issues?id=thaumicenergistics%3AThaumicEnergistics&issues=AWJQx-MUgrzAwlaaz8bv&open=AWJQx-MUgrzAwlaaz8bv
https://sonarcloud.io/project/issues?id=thaumicenergistics%3AThaumicEnergistics&issues=AWJQx-M3grzAwlaaz8dM&open=AWJQx-M3grzAwlaaz8dM
https://sonarcloud.io/project/issues?id=thaumicenergistics%3AThaumicEnergistics&issues=AWJQx-MUgrzAwlaaz8bw&open=AWJQx-MUgrzAwlaaz8bw
2018-03-23 01:59:20 -04:00
Chris a76971f5d4 Fixed potential null exception
https://sonarcloud.io/project/issues?id=thaumicenergistics%3AThaumicEnergistics&issues=AWJQx-IzgrzAwlaaz8TN&open=AWJQx-IzgrzAwlaaz8TN
2018-03-22 23:56:15 -04:00
Chris 99485e5d52 Changed function name to avoid shadowing.
https://sonarcloud.io/project/issues?id=thaumicenergistics%3AThaumicEnergistics&issues=AWJQx-FigrzAwlaaz8Nw&open=AWJQx-FigrzAwlaaz8Nw
2018-03-22 23:49:21 -04:00
Chris 11c7f3a538 Added sonarqube to gradle 2018-03-22 23:34:53 -04:00
Chris McGhee cada323456 Updated readme 2018-03-22 23:34:09 -04:00
Chris d9e49d4692 Fixes #316: Storage bus will remember negative priorities.
Fixed issue where changing storage bus priority did not immediately take effect.
2018-03-18 01:30:38 -04:00
Chris fbe6591626 Version bump 2018-03-17 04:13:53 -04:00
Nividica 1d1e6c56c2 Fixed knowledge inscriber being picky about where shapless items were in the crafting grid.
Potential fix for #333, checks if the item is damageable before doing damage check.
2018-03-17 04:03:51 -04:00
Chris c23ef12a74 Merge branch 'master' of https://github.com/Nividica/ThaumicEnergistics 2018-03-15 02:27:05 -04:00
Chris e51fe4821f Fixes #332: Item bonus aspects are also added to known aspect list.
Fixed: Dupe issue
2018-03-15 02:25:55 -04:00
Chris McGhee c4a6487230 Update README.md 2018-03-11 18:47:32 -04:00
Chris a73d5ce978 Fixes: #313
1) Two extraction requests are generated in the same tick, Where X is the amount currently in the network capped at the items maximum stack size
1.A) X amount (left click)
1.B) X/2 amount (right click)

2) Server processes the requests in order B then A
3) B executes, removing X/2 from the network, and adding to the players hand
4) A executes, removing X from the network, and adding to the players hand

Steps 3 and 4 ensure that the item exists in the network, which is true in both cases, but would not be true if A executed before B
After 3 however, only half of X exists in the network, assuming X was > 1
During step 4 the amount in the network was checked, but was not factored into how much went into the players hand

The result was that the player would get Y(X + (X/2)) items, even if there were fewer than Y items in the network.

The required conditions:
* Fewer than max item stack * 1.5 in the AE network
* * If there was more, both requests could be satified by the network
* Two extraction requests generated in same tick
* * Causing the 'Current' amount to be the same for both requests
* First extraction request processed was the right-click
* * If left-click executed first, network would have 0 of that item, and would fail a prior check.
2018-03-11 18:13:35 -04:00
Chris e2ceefb8b1 NEI Players Inventory Fix
Fixes #309: When shift clicking [?] from NEI, items will also be pulled
from the players inventory if available.
2016-04-27 10:11:41 -04:00
Chris 7e54f83cd1 Removed debugging line 2016-04-21 09:36:45 -04:00
Chris 2df2ff0729 A.C.T. result slot
Fixes #303: A.C.T. result slot can no longer dupe items.
Fixed issue of A.C.T. result slot improperly handling right clicks,
issue was with underlying inventory, as it allowed 'partial' crafting
results to be taken.
2016-04-21 08:38:17 -04:00
Chris ded29d286e Grid refactor
Refactored the essentia grid cache
2016-04-18 20:00:15 -04:00
Chris 03c35a3f1b Hide crafting aspect
Hides the crafting aspect from NEI
2016-04-18 02:58:09 -04:00
Chris 6876fa4b57 E.Term NEI
Fixed #281: Essentia terminal no longer overlayed by NEI at certain
aspect ratios.
2016-04-17 21:48:30 -04:00
Chris ee3b1309fe Source Cleanup
Applied new formatting rules to entire project.
2016-04-17 19:21:08 -04:00
Chris 135f765728 Microblocks
Fixes #300 and #282: Microblock compatibility added.
Fixes #293: Added missing redstone method to level emitter.
Craftable essentia no longer shows in item terminals.
Texture updated: Level Emitter
2016-04-17 18:57:13 -04:00
Chris 3b7d01e83a ASM Transformer cleanup.
Cleaned up ASM transformer code.
2016-04-15 06:28:13 -04:00
Chris faf76b8009 Fixed incorrect render texture 2016-04-14 15:24:59 -04:00
Chris 82f35cfbff Gridblock check 2016-04-14 14:53:26 -04:00
Nividica 50dd7998fb Merge pull request #280 from 3TUSK/zhCN
Update zh_CN.lang, create pack.mcmeta, minor tweak on en_US.lang
2016-04-14 14:42:18 -04:00
Chris fcb4947898 Bug Fixes + Java 8 Migration
Completely moved dev environment to Java 8, Java 7 and earlier is no
longer supported.
Updated forge to 10.13.4.1566
Fixes #294: Wand move targets for shift+click changed to favor player
inventory over ME storage.
Fixes #289: Only AE2 items have aspects applied.
Fixes #299: Assembler no longer eats pearls.
2016-04-14 14:40:36 -04:00
Nividica c5f8ee7e9e Merge pull request #284 from tollus/patch-1
Add null check
2016-04-14 11:37:16 -04:00
Nividica 6c29bb036c Updated readme thanks 2016-02-01 03:06:59 -05:00
Nividica 40c1c29203 Updated lib dependencies 2016-02-01 03:04:53 -05:00
Chris d0ca068773 Java 7 & Null checks
Fixes #268: Getting an item tooltip in the A.C.T. is now a checked
operation.
Fixed potential memory leak on networks with essentia monitor listeners.
Added mod identification to aspects in the Essentia Crafting Terminal.
Fixes #270: Restored Java 7 compatibility.
2016-01-30 08:38:15 -05:00
Chris a61f2275a3 Source Format
Applied formatting rules to all sources.
2016-01-25 19:26:15 -05:00
Chris 21a0e3e54c Documentation
Added basic documentation to classes.
2016-01-25 19:18:12 -05:00
Chris 2cfd702f1b ItemShard fix
Fixes #267: Wildcard damage values will no longer cause GUI crashes.
Added Thaumcraft's itemShard to the ore dictionary, allowing
autocrafting substitutions where allowed.
2016-01-24 18:43:45 -05:00
Chris 963dda76e1 Backpacks with style.
Fixed SMP packet crash.
Fixed potential golem hook crash and added levels of interaction.
Added golem backpack skins.
2016-01-23 16:59:56 -05:00
Chris a43d6ae48c Finishing the backpack.
Bumped version to 1.0.0.0
Fixes #213: Added backpack lore and recipe.
Added backpack config option.
Updated mod info file.
2016-01-22 18:21:54 -05:00
Chris 823b381034 Bug fixes
Cleaned up some ASM transformation code.
Renamed model and texture of golem Addon to golem Backpack
Fixed bug where storage bus did not work when placed after jar was
placed.
Added wifi backpack for Essentia core.
Fixed GUI based dupe bug.
Fixed multiple issues with the Arcane assembler: GUI desync, invalid
network state.
Golem backpack pearl now responds to out-of-range and if golem is
disabled(Fetter).
Fixed issue where the last pattern on a knowledge core could not be
erased.
2016-01-21 13:47:19 -05:00
Chris 373415c4c5 Backpacks & Integration
Added wifi backpack for Gather, Decanting, and Fill cores.
Fixes #265: Restored API call and marked as deprecated.
Fixed broken integration core.
2016-01-19 11:11:13 -05:00
Chris c222d94ceb Much Golem
Added Core Mod.
Added Golem hook system and API.
Added Golem Wifi Backpack, #213
Fixed bug: A.C.T. didn't copy item on middle click when in creative
mode.
Fixed bug: D.P.E. would eat item stacks on shift+click.
2016-01-19 01:48:09 -05:00
Chris ae17e65313 Locked icon + more MP fixes.
Fixed occasional crash when the Knowledge Inscriber GUI was clicked.
Added locked/unlocked texture & indicator to storage monitors.
Fixed bug where autocrafting gui didn't always show the item being
crafted.
Fixed and cleaned up some gui sync issues. (will this never end?!)
2016-01-11 17:30:30 -05:00
Chris ddb483d817 Beta 4 + Configs
Dependency Updated: AE2-rv3-beta-4
Added config options for many things.
2016-01-10 12:55:45 -05:00
Chris 73ef506cb8 Terminal Fixes + Facades
Fixed name collision with "isUseableByPlayer".
Fixed KnowledgeInscriber not being able to erase patterns.
Fixed bug where Terminals would not properly update during certain
AE-network changes.
Fixed bug where craftable essentia was still present on the network when
it should not be.
Added config option to force some thaumcraft blocks to be turned into
facades.
2016-01-10 09:19:12 -05:00
Chris 35dc131b2b Couple logging changes 2016-01-09 08:26:49 -05:00
Chris 1bfda89bc3 GUI QOL
Some finishing touches.
2016-01-09 08:22:02 -05:00
Chris fe304cb626 Cleanup + ACT power loss
Fixes #264 - ACT clears all items on network power loss.
Cleaned up the NBT save code for parts.
Multiplayer gui sync fixes.
Fixed crafting aspect item display name.
Slightly reduced size of all packets.
2016-01-09 06:45:19 -05:00
Chris e3e4a213a7 Cleanup + Config fix
Fixes #263: Replaced flawed conversion amount config item. Essentia
cells should work correctly in the IO Port.
Removed redundant tile entity code.
Cleaned up inventory processing.
2016-01-06 21:38:03 -05:00
Chris b215a36649 Cleanup
More cleanup.
2016-01-05 22:22:42 -05:00
Chris adff438574 Distillation Pattern Encode
Added recipe and Thaumonomicon entry for DPE.
Reduced client packet overhead.
Finishes #53
2016-01-05 18:20:50 -05:00
Chris c9adf1dbcb DPE work
Created block texture for DPE.
Fixed DPE not dropping patterns on breaking.
Enhancing DPE gui.
2016-01-05 03:24:34 -05:00
Chris 4ca46e8266 Essentia Terminal QoL
Essentia terminal player different sounds depending on item.
Added debug level to logger.
Updated essentia terminal lore.
Updated essentia terminal gui.
2016-01-04 13:11:46 -05:00
Chris 08efd770be Essentia Terminal Upgrades
Added mult-mouse-button support to essentia terminal.
Fixed ACT scroll bug issue with NEI.
Essentia terminal can fill/drain containers when they are dragged and
clicked over an aspect.
2016-01-03 16:14:26 -05:00
Chris c095b8131a Cleanup Day - Restructure
Restructured most of the mod into client and common sides
2016-01-02 12:41:28 -05:00
Chris 4f42fdafeb Cleanup Day
Expanded API and added most interfaces.
2016-01-02 11:49:42 -05:00
Chris 4677041dbe Cleanup Day
Added IAspectStack to the API.
Updated all classes to use the new interface.
2016-01-02 11:37:18 -05:00
Chris 3cf6c16778 Essentia Autocrafting
Essentia subsystem now supports craftable aspects.
Essentia terminals now shows craftable essentia.
Reworked some terrible GUI code.
Fixed sort-by-name in the Essentia Terminals.
Fixed a bug where some parts would not be aware of neighboring blocks
when placed.
Fixes #53 :D
2016-01-01 21:10:19 -05:00
Chris 69c5acc78c Distillation Encoder
Implemented Distillation Encoder GUI
Cleaned up tooltip code, and fixed underdraw issue.
2015-12-30 15:20:58 -05:00
Chris 383293c0e7 Distillation Encoder
Added Distillation Encoder
Added pattern handler
Working on GUI
2015-12-30 06:17:37 -05:00
Chris 58b3cdd5fb Autocrafting essentia.
Began integrating essentia into crafting system, #53.
Added "Essentia" item.
2015-12-29 10:55:04 -05:00
Chris bafb097aab Beta 2 + Particles
Fixed #261 AE2-RV3-Beta-2 issue
Added particle effects to Knowledge Inscriber.
2015-12-29 05:01:40 -05:00
Chris 9f338f4239 Same as last commit >.>
*ahem* Find+ReplaceALL, not just Replace
2015-12-28 11:27:42 -05:00
Chris 597d8e63da AE2-RV3-Beta-2 fix
-.-
2015-12-28 11:23:06 -05:00
Chris bcb4a39f88 Network Overhaul
Complete network code overhaul.
2015-12-28 11:10:38 -05:00
Chris fc666d614c Code Formatting
Formatted all code files.
2015-12-28 05:57:11 -05:00
Chris 6fcc282a80 Quality & Safety
Added a lot of safety checks to arcane patterns.
Updated name of storage components and cells to better match AE2's.
Fixes #260 - Players preferred item is now used in arcane patterns.
QOL: Essentia terminal aspects are now un-selectable.
2015-12-28 05:50:13 -05:00
Chris 1d4700f6b1 Version bump
Moving from alpha to beta.
2015-12-27 07:34:52 -05:00
Chris dfdb0cc74a Arcane Autocrafting Substitutions
Fixes #230 - Arcane patterns now respect substitutions.
Note: This change is NOT retro-active. Knowledge cores must have their
patterns re-saved in order for the changes to take effect.
2015-12-27 07:28:51 -05:00
Chris a2ae38edda A.C.T. Crafting job support
Fixes #112 - A.C.T can now issue crafting jobs!
2015-12-27 05:15:24 -05:00
Nividica 50f2c52da4 Merge pull request #257 from Aquahatsche/master
Stable wrench focus fix
2015-12-26 20:15:31 -05:00
Chris 6b6f41bb30 Another wrench focus fix.
Dependency Updated: AE2-rv3-beta-1
Fixes #248 - Focus now interacts with caches properly.
2015-12-24 22:25:21 -05:00
Chris e59dae0e96 Third party compatibility
Fixes #228 - Corrected blacklisting code
Fixes compatibility with Thaumic Tinkerer.
Fixes #249 - Capacity can be checked on any essentia container, inject
now respects essentia the container would not take.
Fixes issue with Technomancy(and any other mods that use my API) where
essentia was voided when mod container is full.
2015-12-24 21:39:26 -05:00
Chris 1d8fbc34ab Updated AE & Forge
Dependency Updated: Forge 10.13.4.1558
Dependency Updated: AE2-rv3-13
Merged pull request #255 - Keridos
Merged pull request #252 - Aquahatsche
Fixed #255 TODO's
2015-12-24 21:04:06 -05:00
Nividica e477de2174 Merge pull request #255 from Keridos/master
Fixes #251 
Fixes #246
Fixes #247
2015-12-24 20:41:14 -05:00
Nividica 89f69a8456 Merge pull request #252 from Aquahatsche/master
Fixes #139
Fixes #253
2015-12-24 20:40:40 -05:00
Chris be4cb0513f AE2-Rv3 support
Dependency Updated: AE2-rv3-9
Fixes #227: Storage bus void support restored, attaches to network when
placed with pre-set filters, and condenser support restored. May address
#234
Added EssentiaProvider to Thaumic Tinkerer blacklist, will be supported
in the next release of Thaumic Tinkerer #228
Fixes #229: Storage bus can fully utilize the Essentia Reservoir without
setting filters.
Fixes #239: Essentia cells obey their filters when used in an IO port.
Fixes #240: Added checks to not redraw the essentia storage monitor or
send update packets if not needed.
2015-10-13 23:29:15 -04:00
Chris 8a65e51037 E.V.C. Side Fix
Fixed #226: Properly sided E.V.C. packet code.
2015-08-03 04:08:44 -04:00
Chris 4449194413 Stack Overflow Fix
Fixed #223: Removed recursive call causing stack overflow.
Aspect registration is more robust when dealing with AE Api changes.
Removed unneeded GL calls from storage monitor.
E.V.C. produces light when active.
2015-07-30 19:58:19 -04:00
Chris a17f24cbf1 Cleanup and Assembler fix
Fixes #219: ACT buttons can be right-clicked to go backwards.
Cleaned up some GUI code.
Really fixed #216.
2015-07-23 18:18:48 -04:00
Chris b7a3b50835 EVC Quality Of Life
More EVC research notes.
The Essentia Terminal can be used to drain or fill the EVC.
2015-07-22 15:06:48 -04:00
Chris cd35680c9b Arcane Patterns: No Substitutes
Fixes #216: Arcane crafting patterns can no longer substitute items.
2015-07-22 11:41:13 -04:00
Chris 4ccbe8f623 E.V.C Nearly Done
Added E.V.C GUI.
API Change: Tile whitelist now requires capacity, and includes a dual
add method.
2015-07-22 07:38:06 -04:00
Chris 6eff3b98ab Vibration Chamber GUI
Preliminary work on Vibration Chamber GUI.
2015-07-21 09:40:32 -04:00
Chris 635a8d9252 Essentia Vibration Chamber
Added Essentia Vibration Chamber recipe & research.
2015-07-21 07:42:14 -04:00
Chris 290a3af19e Essentia Vibration Chamber
Essentia Vibration Chamber:
* Produces Power
* Power based on essentia type
* Power cycle length based on essentia type
* Saves data
* Updates client
2015-07-10 22:08:08 -04:00
Chris 8a4b275a75 Empty Jars
Fixes #214: Empty jars can again be filled in Essentia Terminal.
Fixes #215: Level Emitter adjustment button placement corrected.
2015-07-10 14:51:36 -04:00
Chris 7a035fcb34 Java 7 Support
Made the essentia grid cache compatible with Java 1.7 #211
2015-07-04 16:30:58 -04:00
Chris a403b05157 Level Emitter Update
Changed level emitter block update code to match AE emitter.
2015-07-04 00:44:38 -04:00
Chris f42667b7a1 Compiler Warning Fixes 2015-07-03 02:46:10 -04:00
Chris baadf538ab CC Help
Added CC help command.
2015-07-03 02:32:41 -04:00
Chris 36aeeeaaa9 Forge Update
Bumped forge to 10.13.4.1448
2015-07-03 01:04:28 -04:00
Chris 6e5152908d ACT fixes
Using the wrench focus on a pedestal no longer spawns wrenches.
Fixes #204: ACT search box focus obeys search mode.
Fixes #201: ACT GUI less laggy when ME system very busy.
2015-07-03 00:32:27 -04:00
Chris 27b60213ae Import Bus Crash
Fixes #203: Crystallized Essentia & Wisp Essence can now be used to set
filters.
Fixes #206: Import bus will no longer crash with redstone card.
2015-07-02 20:36:56 -04:00
Chris a36538c23b Essentia Watcher
Added essentia watcher.
Updated gearbox bounding box.
2015-06-12 18:13:47 -04:00