Commit Graph
166 Commits
Author SHA1 Message Date
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
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
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
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
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 6a1657eaa6 Fix some desync in data between server and client active states of blocks 2019-04-04 11:23:40 -04: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 5cf9551123 Add some JavaDocs to the new Capability Interfaces 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
pupnewfster b4adb6d5f8 Easier disabling of capabilities, and support for offset capabilities 2019-04-02 12:50:14 -07:00
Richard Freimer 8c276b6b1a IInventory automation removal (#132)
* Start killing off IInventory
* Write a couple TODO's of things that should eventually use IItemHandler
* Remove unused variable, and add back special case handling for bins
* Update some of the implementations of getSlotsForFace
https://github.com/mekanism-mod/Mekanism/commit/11e9e2df7a2f2b053fcb9371bf496f7aa88a04cd
* Cleanup a bit of implementation around items being valid for a slot
2019-03-29 10:32:11 -06:00
Aidan 934788e0e7 Transit request overhaul (#135)
* Fix a pretty glaring issue in Pos3D equality checks
* TransitRequest/TransitResponse overhaul. Items can now be pulled from multiple slots at once by Logistical Transporter and Logistical Sorter. getTopStacks() is now buildInventoryMap() and is more comprehensive of a total inventory. Note this is entirely untested and may have some issues to work out!
* Cache hash code of HashedItem
* Remove ISidedInventory/IInventory implementations
2019-03-29 08:00:18 -06:00
Dave Smith 987894c63f Reduce idle tick time on DigitalMiner by removing constant refreshing of chunk set 2019-03-28 11:01:58 -06:00
temp1011 b511470778 remove unused imports 2019-03-26 14:57:31 +00:00
temp1011 392b7c2ea0 remove and inline methods 2019-03-26 14:50:30 +00:00
Richard Freimer 5a67067f07 Update config to include comments (#108)
* Add comments to configs
* Removed unused options
* Added a few of the newer options mainline Mekanism supports
* Also list the default values in the MekanismConfig class for easier comparision
* Change spacing slightly for tools config in code
* Add some of the missing generator config comments
* Config comments for tiers, and add missing comment for MinerSilkMultiplier
* Config comments for rest of generators module
* Fix which stick to sawdust recipe
* Config comments for tools
* Config comments for armor
* Add warning to DM radius comment, and fix a couple things addressed in PR comments
2019-03-24 14:40:28 -06:00
pupnewfster 1b6cfd37e9 Address comments on PR 2019-03-24 14:26:33 -06:00
pupnewfster 83d0c81151 Fixes incomplete IItemHandler impl of lots of tile entities closes #102 2019-03-24 14:26:33 -06:00
pupnewfster 6a7fbfc2f5 Fix location of Digital Miner and Laser Fake Players, for BlockBreakEvent
Closes #98
2019-03-22 11:05:11 -04:00
pupnewfster 21017efc68 Don't reference main class from API package
https://github.com/mekanism-mod/Mekanism/commit/7c50d1e7cc3dd915979304b46e77a36068ac457d
2019-03-21 10:53:28 -04:00
Richard Freimer cd5fe2040b Gui cleanup (#74)
* Update dependencies for dev environment to have latest versions
* Fix depreated method usage for JEI
* Add Deprecated annotation to methods overriding a deprecated method
* Fix various Deprecated method calls
* Slightly clean up gui code based on IntelliJ inspections
* Remove some unused variables/calculations from the gui code
* Remove some unused variables/calculations from the generator gui code
* Create a bit of hierarchy for Gui's that keep track of TileEntities
* Cleanup Gui Element having majority of variables as public
* Cleanup some duplicate math
* Store tile entity type in a less duplicated manner
* Cleanup Gui ResourceLocation handling. Makes it easier to read the code
* Switch adding to a method
* Switch remaining GUI variables to private/protected
* Partially cleanup Gui Filter code
* Cleanup some of the Chemical Gui Code
* Fix missing a few files in last commit
* Improve handling of Tile Entities in GUIs
2019-03-19 16:10:57 -06:00
Dave Smith e0b7ea62a4 The Great Reformat; moving to google-java-style w/ 4 space indent and 120 column line wrap 2019-03-09 22:47:13 -07:00
Richard Freimer 083c764b7b Dedupe a bunch of code (#27)
* Initial work on deduplicating code for tiles
* Dedupe Energy Cube and Induction Matrix Container
* Dedupe Robit Gui
* Move robit gui code into its own subpackage
* Dedupe DM Filter guis
* Dedupe fluid storage containers
* Move filter guis into one package
* Dedupe filter select
* Dedupe Some Transport Filters
* Further Dedupe Some Text Filter Code
* Dedupe Miner ItemStack/Material GUI Filters
* Move gui filter implementations into a sub package
* Dedupe Gui Transport ItemStack/Material Filters
* Fix copy pasting wrong buttons
* Dedupe Gui Type filter some
* Dedupe Gui Filter code some
* Dedupe Gui Oredictionificator Filter
* Dedupe generator containers
* Dedupe Mekanism Tools, pickaxe, shovel, paxel
* Dedupe code in TileEntityDigitalMiner
2019-03-09 20:13:52 -07:00
Dave Smith 95ca29fa19 Squashed commit of the following:
commit 0d4dc5991e572793134c0c1af8bb35db528071ad
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 19:25:28 2019 -0500

    IntelliJ inspections, Unused Import

commit c757d3236b6304b1d3295ad392b88677bccf3003
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 19:09:24 2019 -0500

    IntelliJ inspections, Constant conditions & exceptions

commit c63a821ef9fc705941052a876cc1ef950471912e
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 17:41:31 2019 -0500

    IntelliJ inspections, @NotNull/@Nullable problems

commit 506bbfd3241336082b17e5d47f8cec496666dcff
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 16:50:46 2019 -0500

    IntelliJ inspections, Unused label

commit bad10c2428346b5feb1816e4a78d7cc2bc1259f0
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 15:33:54 2019 -0500

    IntelliJ inspections, Unused assignment

commit bfe633afbfb6380d0f5ee2e8ab14f8981a455681
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 15:32:02 2019 -0500

    IntelliJ inspections, 'equals()' between objects of inconvertible types

commit 6d179f8639fad1a7c3fa01467c003a8fd309da09
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 15:29:28 2019 -0500

    IntelliJ inspections, Unused import

commit c21f1cfa5566308237dc8bddb8b79908e272a637
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 15:25:41 2019 -0500

    IntelliJ inspections, Unused import

commit e5d9e03af582c7315b057861b8f0019e46157dee
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 15:23:10 2019 -0500

    IntelliJ inspections, Redundant 'throws' clause

commit 1c589ba5740411a5595e9fda177696670bc7b7df
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 15:21:07 2019 -0500

    IntelliJ inspections, Static member referenced by instance variable

commit 6c17e9ca7fb22a0e285337133659e826f3bfdfee
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 15:20:02 2019 -0500

    IntelliJ inspections, Catch block may ignore exception

commit 42b3cd788ceb7d6ce657d582bbbd8345a2ec5676
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 15:16:29 2019 -0500

    IntelliJ inspections, Unnecessary label on 'break' statement

commit f6abc3c66f3aca147edb274720cdb94bff568b0b
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 15:15:29 2019 -0500

    IntelliJ inspections, Too weak variable type leads to unnecessary cast

commit 6356d1fea8d55907ae1c7b011223fbbc07236c1f
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 15:11:17 2019 -0500

    IntelliJ inspections, Redundant type cast

commit 559c1a2ff523fd7e23f3750d5c801af73876f1d0
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 15:04:45 2019 -0500

    IntelliJ inspections, Redundant type arguments

commit ae816ec2a79cf4c8fee776db651a54f68c1dacaa
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 15:01:27 2019 -0500

    IntelliJ inspections, Redundant Collection operation

commit 1da69b8baff922b98a32163c7d5f90aa77a6a8bc
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 15:00:55 2019 -0500

    IntelliJ inspections, Redundant array creation

commit 7e3ef81a3597c596d2206c93442e950ac9183de0
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 15:00:11 2019 -0500

    IntelliJ inspections, Condition is covered by further condition

commit f298bbb9f31ecbe935ef6cbf98b56951434a05f8
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 14:58:10 2019 -0500

    IntelliJ inspections, Redundant 'Collection.addAll()' call

commit ce715c5cd724c4dc71ff2cb53e5bc12f16289f12
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 14:56:56 2019 -0500

    IntelliJ inspections, 'Collection.toArray()' call style

commit 0bde4b0eb23ac5d8f40a410ed55315e4a422a30c
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 14:55:40 2019 -0500

    IntelliJ inspections, Calls to 'Arrays.asList()' with too few arguments

commit 6d06d11dcf9c077ed6b216a0bbd61434b10fc610
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 14:52:26 2019 -0500

    IntelliJ inspections, Pointless arithmetic expression

commit 6501d725af1eda5127489f77fd723396002b29b2
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 14:42:32 2019 -0500

    IntelliJ inspections, Anonymous type can be replaced with lambda

commit 85341ae5df9d63fb0ad7281c260c77d064adf0c2
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 14:41:40 2019 -0500

    IntelliJ inspections, Explicit type can be replaced with <>

commit 7e2feae7189b92cb513499aed113d4a2634622c6
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 14:38:47 2019 -0500

    IntelliJ inspections, Unnecessary 'null' check before method call

commit 2c75a38fe9a969f832cd5777f4fad81ef47d037b
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 14:37:33 2019 -0500

    IntelliJ inspections, 'switch' statement with too few branches

commit 2e2aff57f7910aef5a68f41a1918e2c8a98509ec
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 14:34:50 2019 -0500

    IntelliJ inspections, Simplifiable conditional statement

commit 243f6a975f8b3da5e70a5c1a116db2aedd10900e
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 14:33:09 2019 -0500

    IntelliJ inspections, Duplicate condition in 'if' statement

commit a80c67fc30b737990e7805a8741dce120232badc
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 14:32:17 2019 -0500

    IntelliJ inspections, Unnecessary semicolon

commit 5a7220ee574c9d38d71db07e4fa995a56fee1eed
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 14:31:58 2019 -0500

    IntelliJ inspections, Unnecessary enum/interface modifier

commit f3a66f4462033d2f446c2961a1ad8e9cfde3ed36
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 14:30:36 2019 -0500

    IntelliJ inspections, Unnecessary conversion to String

commit 1662540be864db4669cd80c8c46a9b35be202b62
Author: pupnewfster <[email protected]>
Date:   Thu Mar 7 14:29:33 2019 -0500

    IntelliJ inspections, C styled array declaration
2019-03-07 21:53:20 -07:00
Dave Smith 8d3f8df49c Updating to 14.23.5.2808; naming fixes where necessary 2019-02-24 12:21:48 -07:00
Xander bb6b7c8cad Make mining match check match what the search thread uses to determine meta (the correct way). Fixes #4841 2017-12-03 13:11:30 +08:00
Xander 353eecc3ef suppress capability unchecked cast warning 2017-11-21 20:18:22 +08:00
Xander 9e49a7ccb3 Prevent the digital miner from stalling when the block break is denied. Skip it instead 2017-11-21 20:12:58 +08:00
Aidan bed953f0f0 Merge branch '1.12' into nonnull-network 2017-11-16 12:09:46 -05:00
Xander 32af79f8f6 fix digital miner meta & avoid creating an itemstack for each filter 2017-11-08 21:58:24 +08:00
Xander Victory 2411a1be4d change ArrayList<Object> to a non null list implementation for network data 2017-11-08 15:08:51 +08:00
Tom Elfring 34e81bb65d Remove ~350 unsave casts 2017-08-05 19:48:12 +02:00
Tom Elfring babbe59cab Cleanup
Removed unused imports
Add/remove all methods used for arrays
Removed manual array copy
2017-08-05 18:12:45 +02:00
Tom Elfring b72d6efab3 Java 7 and 8 cleanup
Diamond operator <>
Lambdas and method references
2017-08-05 17:50:38 +02:00
Tom Elfring c9dc4c0ac0 Merge remote-tracking branch 'upstream/1.11' into 1.12 2017-08-04 18:49:20 +02:00
aidancbrady d38d519238 Fixed crash 2017-08-02 20:54:17 -07:00
aidancbrady 8ed83b0e4f Merge branch '1.11' into 1.12
* 1.11:
  Fixed the horrible transmitter issue (spec: DynamicNetwork:215-218) Also, fixed client render update delay
  move zh_cn lang file back to thr correct place
  Update entity names
  Another cleanup
  Fix dev environment after adding SD compat
  Kill off some unused code
  Updated minor compat

Conflicts:
	build.gradle
2017-07-31 18:40:01 -07:00
aidancbrady 48c748e55e Kill off some unused code 2017-07-26 14:04:26 -07:00
Tom Elfring 69e163abd9 Merge remote-tracking branch 'upstream/1.11' into 1.12_firstpass 2017-07-26 19:38:35 +02:00
Tom Elfring 341e11da70 Fix config caching of pump, miner and plenisher.
Fixes 4560.
2017-07-26 10:17:00 +02:00
Tom Elfring df68b1e36a Merge remote-tracking branch 'upstream/1.11' into 1.12_firstpass 2017-07-23 13:56:41 +02:00
Aidan f590af2e04 Merge branch 'master' into master 2017-07-22 20:54:20 -07:00
Tom Elfring a13ce7910d Update mappings to 20170616 2017-06-16 20:26:39 +02:00
aidancbrady 98a0b2aa81 Fixed Digital Miner dupe bug 2017-04-28 16:59:52 -04:00
aidancbrady 21c49c1643 Advanced item handing, adding inventory-searching to basic item ejection- no longer will items get jammed
Also, fixed transmitter tooltips
2017-04-28 14:54:26 -04:00
aidancbrady 808f0cdf8a More refactoring, gave Rotary Condensentrator and Electrolytic Separator sound effects. Need to fix bugs 2017-04-27 22:51:44 -04:00