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
075673fc56
Improve Compat with TOP ( #5427 )
...
* Make TOP display full capacity of fluid and gas networks. Also fix some capabilities not returning the proper. TOP Gas integration now displays the gas color as well.
* Ensure no repercussions for getting MechanicalPipe's TOP network tanks
* Ensure no repercussions for getting PressurizedTube's TOP network tanks
* Display hydrogen with a slightly incorrect color so TOP renders properly
* Fix dynamic valve having item handler always disabled instead of just when multiblock is not made
* Fix a few itemhandlers that should not be disabled for side == null TOP compat
* Always expose networks buffer instead of local buffer if there is a network
2019-04-30 22:12:43 +08: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
pupnewfster
ed9dedd39c
Remove a lot of the unchecked cast warnings around capabilities
2019-04-02 12:50:14 -07:00
pupnewfster
66d0bca37c
Remove usage of TUBE_CONNECTION_CAPABILITY, in favor of using toggleable capabilities
2019-04-02 12:50:14 -07:00
pupnewfster
cf8ef8ad5f
Move configuration capability checking from CapabilityUtils to TileEntityComponentConfig
2019-04-02 12:50:14 -07:00
pupnewfster
1f5353bd04
Obey the configuration tabs of various machines
2019-04-02 12:50:14 -07:00
temp1011
392b7c2ea0
remove and inline methods
2019-03-26 14:50:30 +00: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
pupnewfster
3d73604315
Cleanup some code in case something gives null fluid stacks
2019-03-17 18:27:42 -06:00
Dave Smith
c92069f716
Fix #5209 ; now using FluidStacks everywhere, including all more efficient encodings over network
2019-03-11 14:00:40 -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
Aidan
bed953f0f0
Merge branch '1.12' into nonnull-network
2017-11-16 12:09:46 -05:00
Xander Victory
a86539f1a0
add gas handler methods for retrieving the tank infos regardless of side.
2017-11-10 15:23:48 +08:00
Xander Victory
07415eabe2
null fluid handler
2017-11-10 12:12:13 +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
aidancbrady
f58924bc03
Fixed potential desyncs
2017-08-11 09:30:42 -07:00
Tom Elfring
5dd3dbb8a9
Code cleanup
...
Redundent assignments
Wrong comparison of string with MRL
Unneeded reflection
Try with resources
Metallurgy compat deleted (was outcommented) not updated since MC 1.7.10
2017-08-06 13:38:32 +02:00
aidancbrady
b40cd5c20e
Merge branch '1.11' into 1.12
...
* 1.11:
add a couple of comments [no-ci]
add Anchor Upgrade to Entangleporter
Store Quantum Entangleporter frequency (name and public/private only) in the itemstack when dismantled. Displayed in the sneak key info tooltip.
Increase Entangleporter frequency to be able to store as much as ultimate tiers can transmit.
static field access to Class access
Conflicts:
src/main/java/mekanism/common/frequency/Frequency.java
src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java
2017-08-05 19:43:27 -07:00
Xander
aabcd0d77a
add Anchor Upgrade to Entangleporter
2017-08-06 00:18:39 +08: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
Xander
45b48600d0
static field access to Class access
2017-08-05 21:01:42 +08:00
Tom Elfring
6721909e84
Remove unused exceptions
...
Access static variables through class, not instances
Remove non-looping for loops
2017-08-05 13:46:11 +02:00
aidancbrady
6ef08e90f1
Another cleanup
2017-07-27 09:33:09 -07:00
aidancbrady
48c748e55e
Kill off some unused code
2017-07-26 14:04:26 -07: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
aidancbrady
5c956f47de
Added (configurable) Configurator mode sneak-scroll toggle
2017-05-27 14:44:38 -07: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
aidancbrady
6f2b84e547
Totally refactor frequencies to use UUIDs instead of player usernames
2017-04-24 14:15:43 -04:00
aidancbrady
a9d438c962
Fixed Quantum Entangloporters
2017-04-22 14:36:04 -04:00
aidancbrady
c9cbb405d4
More API fixes
2017-04-13 16:15:26 -04:00
aidancbrady
b4c5cf73a9
Fixed Quantum Entangloporters
2017-03-29 18:48:49 -04:00
aidancbrady
01ab160ff9
Transition from null stacks to ItemStack.EMPTY
2017-03-29 01:08:36 -04:00
aidancbrady
6a42eb64e3
Update to 1.11.2. Untested, still using outdated MCMP
2017-03-25 20:35:26 -04:00
aidancbrady
3505d553d9
Merge branch 'development' into 1.9.4
...
* development:
Fixed Robit AI
Fixed Robit dupe glitch
Fixed the stupid invalid frequency issue
Conflicts:
src/main/java/mekanism/client/ClientProxy.java
src/main/java/mekanism/client/gui/GuiRobitCrafting.java
src/main/java/mekanism/client/gui/GuiRobitRepair.java
src/main/java/mekanism/common/CommonProxy.java
src/main/java/mekanism/common/RobitAIPickup.java
src/main/java/mekanism/common/inventory/container/ContainerRobitCrafting.java
src/main/java/mekanism/common/inventory/container/ContainerRobitRepair.java
src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java
2016-07-05 18:42:43 -04:00
aidancbrady
f4582dbccf
Fixed the stupid invalid frequency issue
2016-07-05 17:01:58 -04:00
aidancbrady
b77ca6ff0c
Revert "Remove deprecated gas API methods"
...
This reverts commit c5a414df37 .
2016-06-30 01:03:13 -04:00
aidancbrady
c5a414df37
Remove deprecated gas API methods
2016-06-29 19:58:13 -04:00
aidancbrady
08700a82e7
Improved fluid handling
2016-06-29 12:26:34 -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
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
a89b8f666c
<200 errors. All I have left is a bit of rendering work and the new "off hand" stuff
2016-05-25 17:30:22 -04:00
aidancbrady
fa46db4ce6
Removed unused mtl and obj commands, got heat network (and conductors) working with capabilities
2016-05-24 18:47:43 -04:00
aidancbrady
60b9db3163
Implement BlockableConnection and HeatTransfer capabilities, fixed transporter connections
2016-05-23 20:32:12 -04:00
aidancbrady
273e89a3b2
Get gas API completely working with capabilities
2016-05-23 13:45:17 -04:00
aidancbrady
b618263e69
Remove deprecated IGasHandler methods, properly implement AlloyInteraction and GasHandler capabilities
2016-05-23 12:44:05 -04:00