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
88eae4f314
Port a couple missed commits ( #5376 )
...
* Port d303295da Move all version number references to gradle based
* Port ebb0c467717 dont set main multiblock position to air if its not loaded or not the right tile. Log if its not null but not what we expect
* Fix compile error
2019-04-09 22:39:06 -04: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
Dave Smith
32eccdec9c
Rename all Mekanica -> Mekanism
2019-04-03 10:50:13 -07:00
pupnewfster
b4adb6d5f8
Easier disabling of capabilities, and support for offset capabilities
2019-04-02 12:50:14 -07:00
Dave Smith
f2c7abc051
Change info to warn, per review request
2019-03-17 13:08:45 -06:00
Dave Smith
17c5287555
Fix #5110 , #3718 , #4226 ; Advanced bounding blocks were setting miner block to air if chunk wasn't loaded :/
2019-03-17 13:08:45 -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
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
Tom Elfring
049c780888
Move mod id references to a constant
2017-08-07 20:16:16 +02:00
Tom Elfring
5bcdb2b2be
Merge remote-tracking branch 'upstream/1.11' into 1.12
2017-08-07 20:09:31 +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
Tom Elfring
c9dc4c0ac0
Merge remote-tracking branch 'upstream/1.11' into 1.12
2017-08-04 18:49:20 +02:00
aidancbrady
5bd67b37b2
Fixed IC2 integration
2017-07-31 19:41:24 -07:00
Tom Elfring
69e163abd9
Merge remote-tracking branch 'upstream/1.11' into 1.12_firstpass
2017-07-26 19:38:35 +02: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
Tom Elfring
e9957ad895
Make redstoneflux an optional dependency
2017-07-23 13:59:18 +02:00
Tom Elfring
5ef94efa3d
Update to new RF API
2017-06-27 13:36:16 +02:00
Xander Victory
8599224fca
Fix some more null ItemStacks found with Idea
2017-06-13 14:38:49 +08:00
aidancbrady
5c956f47de
Added (configurable) Configurator mode sneak-scroll toggle
2017-05-27 14:44:38 -07:00
aidancbrady
61e024b8e8
Fixed Digital Miner bound issue
2017-04-27 16:34:09 -04:00
aidancbrady
cf6a04a65d
Refactored energy API to play nicely with new changes
2017-03-31 16:50:11 -04:00
aidancbrady
6a42eb64e3
Update to 1.11.2. Untested, still using outdated MCMP
2017-03-25 20:35:26 -04:00
aidancbrady
4745a78ecc
Fixed Digital Miner breaking
2016-07-10 11:34:00 -04:00
aidancbrady
333cc7ff27
Completed Tesla support, using a handy new system of wrapper-abstracted item and tile capability handlers
2016-07-02 01:27:49 -04:00
aidancbrady
e6da7fdc9c
Update to latest Forge, use Capability standards. Need to port to new fluid system
2016-06-23 16:34:27 -04:00
aidancbrady
bf99b5868e
Update CoFH API
2016-06-22 12:21:26 -04:00
aidancbrady
1cc41c8722
Update IC2 API
2016-06-22 12:13:18 -04:00
aidancbrady
fa24e0e780
Isolate MDK, update build script. Gonna try to get this pushing to the dev server
2016-05-28 19:14:18 -07:00
aidancbrady
c9f8fd011e
Polished capabilities, still need to decide if we're allowed to ship capability references in API
2016-05-27 14:02:15 -04:00
aidancbrady
af008b9395
<1000 errors
2016-05-24 23:35:37 -04:00
aidancbrady
3983cc858b
Begin the great port. 2378 errors to go!
2016-05-24 20:04:40 -04:00
aidancbrady
566907ad0b
GUI fixes, fixed Electrolytic Separator model- need to figure out why heavy water texture is acting weird
2016-05-17 16:25:09 -04:00
aidancbrady
374cc57515
Use new GlStateManager methods, got armor models to render (though the transformations seriously need to be updated)
2016-05-10 22:24:37 -04:00
aidancbrady
ddfe83c495
Of course, the issue isn't on Minecraft's end, it has to do with Coord4D hashing. Coord4D no longer extends BlockPos to prevent hash issues
2016-05-09 21:07:18 -04:00
Ben Spiers
384cf174bb
Get capabilities off the ground
2016-05-04 12:45:12 +01:00
Ben Spiers
0cb18773aa
Merge branch 'development' into 1.8.9
2016-04-25 16:08:06 +01:00
aidancbrady
4a78cb65b1
Digital Miner now only accepts cable connections on certain sides
2016-03-23 19:51:37 -04:00
Ben Spiers
84336ec4d1
Merge branch 'development' into 1.8.9
...
Huge merge with 202 conflicts, hopefully not *too* broken.
2016-03-18 04:24:19 +00:00
aidancbrady
1eff6ad6b8
Ship with CoFH energy API (as well as a few item tidbits). It's about time
2016-03-06 12:42:04 -05:00
aidancbrady
866c76bafe
Redesigned Filter Cards to serve as Configuration Cards, fixed inventory interaction bug, fixed Creative Energy Cube bug, added new recipes
2016-03-05 13:17:58 -05:00
aidancbrady
87438dcc7f
Boiler work, added heat info tab, worked on polishing heat interactions among machines
2016-02-27 13:32:48 -05:00
Ben Spiers
a27c9b6839
tile package done, except for TEDigitalMiner
2016-01-25 04:36:00 +00:00
Ben Spiers
dedc84605f
getInventoryName() -> getName()
2016-01-23 14:24:42 +00:00
Ben Spiers
a80f724cc2
Apply various common one-to-one replacements
...
More work on common too. network package now done.
2016-01-23 13:24:51 +00:00
Ben Spiers
9b8d9d92d6
Start update to 1.8.9
...
Fix all references to cpw.mods.fml namespace
2016-01-14 19:22:48 +00:00
aidancbrady
c7fe1f86eb
Cleaner CC support with a separate peripheral handler
2015-07-20 12:28:18 -07:00
aidancbrady
ee709cc202
New computer integration for the rest of Mekanism machinery
2015-07-20 11:43:49 -07:00
Ben Spiers
71a9bfc4f9
Make the @Optional removals stricter.
...
Require IC2, BC or CoFHCore to be loaded in order to use their respective APIs. Remove all the individual mod deps to prevent us depending on mods that depend on us.
2015-03-16 15:48:19 +00:00