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
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
Dave Smith
9456b68529
Introduce bounds to search for sparkles! ( #5343 )
...
* Address c368692a3; create upper bound on number of blocks scanned and reduce memory utilization
* Final cleanup on sparkle overhaul; all multiblock structures should now sparkle in < 1ms on average
* Remove timing info; either enable sparkles or the message (not both)
2019-04-07 22:43:17 -04: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
pupnewfster
1a05fc9680
Implement isItemValidForSlot for ItemHandlers and obey it for inserting
2019-03-24 14:26:33 -06: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
Dave Smith
045358436f
Overhaul solar generation to be more realistic; helps with #46
2019-03-18 22:11:27 -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 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
a13ce7910d
Update mappings to 20170616
2017-06-16 20:26:39 +02:00
aidancbrady
c9cbb405d4
More API fixes
2017-04-13 16:15:26 -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
62c0588722
Restrict Thermal Evaporation Plant output to needed
2016-07-23 23:11:32 -04:00
aidancbrady
202f917345
Begin porting fluid items
2016-06-30 10:41:55 -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
286394f7ac
Merge branch 'development' into 1.9.4
...
* development:
Fixed Bin amount render position
Bump version to 9.0.3, change Wind Generator weather category, fix Logistical Sorter sound config bypass, fixed Thermal Evaporation Plant internal render
Conflicts:
build.properties
src/main/java/mekanism/client/render/tileentity/RenderBin.java
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java
src/main/resources/assets/mekanism/sounds.json
2016-06-22 14:29:27 -04:00
aidancbrady
44ecdd41d0
Bump version to 9.0.3, change Wind Generator weather category, fix Logistical Sorter sound config bypass, fixed Thermal Evaporation Plant internal render
2016-06-22 14:20:22 -04:00
aidancbrady
22b2b0747e
Fixed Thermal Evaporation Controller crash
2016-06-15 20:51:04 -04:00
aidancbrady
a5f4457677
Merge branch 'development' into 1.9.4
...
* development:
Update pt_BR.lang
Allow shift-right clicking machines with upgrades
Fixed NBT reference losses
Fixed Thermal Evaporation Controller computer integration
Add config option for transmitter alloy upgrades
Fixed transmitter crash, fixed entangloporter frequency issue, fixed PRC muffling upgrades
Conflicts:
src/main/java/mekanism/client/render/RenderPartTransmitter.java
src/main/java/mekanism/common/FluidNetwork.java
src/main/java/mekanism/common/item/ItemAlloy.java
src/main/java/mekanism/common/item/ItemUpgrade.java
src/main/java/mekanism/common/util/PipeUtils.java
2016-06-15 20:41:32 -04:00
aidancbrady
6340bb3cdc
Fixed NBT reference losses
2016-06-10 11:30:03 -04:00
aidancbrady
e1a5bf13c7
Fixed Thermal Evaporation Controller computer integration
2016-06-10 11:17:26 -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
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
c002ac6d8a
Glow Panels render in item form, use getEffectiveSide() instead of isRemote when checking packet security
2016-05-18 19:06:36 -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
20bd989687
Merge branch 'development' into 1.8.9
...
* development:
Fixed packet security
Fixed 'other dust' registration
Better fake player reporting, thanks to @DraksterAU
Conflicts:
src/main/java/mekanism/common/item/ItemOtherDust.java
src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
src/main/java/mekanism/common/tile/TileEntityBasicBlock.java
src/main/java/mekanism/common/tile/TileEntityBasicMachine.java
src/main/java/mekanism/common/tile/TileEntityBin.java
src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java
src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java
src/main/java/mekanism/common/tile/TileEntityChargepad.java
src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java
src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java
src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java
src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java
src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java
src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
src/main/java/mekanism/common/tile/TileEntityDynamicTank.java
src/main/java/mekanism/common/tile/TileEntityElectricPump.java
src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java
src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
src/main/java/mekanism/common/tile/TileEntityFactory.java
src/main/java/mekanism/common/tile/TileEntityFluidTank.java
src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java
src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java
src/main/java/mekanism/common/tile/TileEntityGasTank.java
src/main/java/mekanism/common/tile/TileEntityInductionCell.java
src/main/java/mekanism/common/tile/TileEntityInductionPort.java
src/main/java/mekanism/common/tile/TileEntityInductionProvider.java
src/main/java/mekanism/common/tile/TileEntityLaser.java
src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java
src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java
src/main/java/mekanism/common/tile/TileEntityMultiblock.java
src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java
src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java
src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java
src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java
src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java
src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java
src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java
2016-05-17 14:23:57 -04:00
aidancbrady
7ae60615e2
Fixed packet security
2016-05-17 13:49:55 -04:00
aidancbrady
735106c25e
Begin work on MekanismGenerators
2016-05-12 15:07:54 -04:00
aidancbrady
98c57960d1
Got more CTM stuff rendering
2016-05-10 00:12:01 -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
0cb18773aa
Merge branch 'development' into 1.8.9
2016-04-25 16:08:06 +01:00
aidancbrady
5dcddaf25b
Fixed glass render, added new Thermal Evaporation Plant computer integration
2016-03-22 17:18:55 -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
34d55f72ea
More fluid container integration, removed dead code
2016-03-06 02:57:32 -05:00
aidancbrady
d332ad49b7
More consolidated fluid container management- I've been meaning to get to this for a long time
2016-03-06 02:15:56 -05:00
aidancbrady
b13d8ee1ab
Fixed fluid duplication
2016-03-05 18:48:49 -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
716aabece5
Fix merge
2016-02-20 22:58:17 +00:00
Ben Spiers
b08bca67d4
Merge branch 'v9' into 1.8.9
2016-02-20 22:19:34 +00:00