Commit Graph
67 Commits
Author SHA1 Message Date
Richard Freimer c8d2fbbac8 Add comparator support for a large number of blocks (#5474)
* Add comparator support to a lot of various blocks. Closes #5447

* Add comparator support for various generator blocks

* Cleanup some old calculations not using the new utils method
2019-05-13 15:50:02 -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
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
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 83d0c81151 Fixes incomplete IItemHandler impl of lots of tile entities closes #102 2019-03-24 14:26:33 -06:00
pupnewfster b55fb42453 Fix some tiles outputting gas to the wrong side 2019-03-23 23:27:07 -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
Dave Smith 3fd75404e4 Overhaul solar neutron activator to use better sun/rain detection. Reduce network traffic by 50% by ensuring we only send updates every second 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
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 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 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 808f0cdf8a More refactoring, gave Rotary Condensentrator and Electrolytic Separator sound effects. Need to fix bugs 2017-04-27 22:51:44 -04:00
aidancbrady c9cbb405d4 More API fixes 2017-04-13 16:15:26 -04:00
aidancbrady 4733420eee API improvements 2017-04-12 20:23:16 -04:00
aidancbrady 9db5a37d4b More ItemStack fixes, thanks @thommy101 2017-04-10 23:45:53 -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 d8caab07f5 Fixed gas auto-output 2016-09-12 16:33:15 -04:00
aidancbrady 6e0a63c3ee Merge branch 'development' into 1.9.4
* development:
  Better Structural Glass recipe
  Fixed Portable Teleporter issue, fixed compounded Factory localization, add upgrades support to Solar Neutron Activator

Conflicts:
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/network/PacketPortableTeleporter.java
	src/main/java/mekanism/common/tile/TileEntityFactory.java
	src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java
2016-07-16 12:26:58 -04:00
aidancbrady 88ead85f0e Fixed Portable Teleporter issue, fixed compounded Factory localization, add upgrades support to Solar Neutron Activator 2016-07-16 12:16:55 -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 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 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 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
aidancbrady be863a4289 Add Mekanism Shaped and Mekanism Shapeless recipe handlers, use ItemDataUtils to consolidate non-subtype-based NBT data into a single compound 2016-05-19 18:48:59 -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 571a14be17 Fixed continuous block updates, fixed Heavy Water texture 2016-05-18 11:19:00 -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 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 2e2f4ce390 Merge branch 'development' into 1.8.9 2016-04-29 16:52:22 +01:00
aidancbrady 16c7dc92af More rendering fixes 2016-04-27 19:08:01 -04:00
Ben Spiers 0cb18773aa Merge branch 'development' into 1.8.9 2016-04-25 16:08:06 +01:00
aidancbrady a18da2ad27 Integrate security into more machines 2016-03-21 18:25:27 -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