pupnewfster
b4adb6d5f8
Easier disabling of capabilities, and support for offset capabilities
2019-04-02 12:50:14 -07:00
Richard Freimer
cbd2aab888
Fixes IC2 complaining about unregistering without registering fixes #146 ( #147 )
2019-04-01 09:59:29 -06: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
1b6cfd37e9
Address comments on PR
2019-03-24 14:26:33 -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
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
4381be10ea
Dss mekanica rename ( #50 )
...
Introduce mekanica rename
2019-03-12 12:23:20 -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
Xander Victory
2411a1be4d
change ArrayList<Object> to a non null list implementation for network data
2017-11-08 15:08:51 +08:00
Joseph C. Sible
b0bbf5cb68
Fix several type-safety issues
2017-09-23 22:21:28 -04: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
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
5bd67b37b2
Fixed IC2 integration
2017-07-31 19:41:24 -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
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
Tom Elfring
69e163abd9
Merge remote-tracking branch 'upstream/1.11' into 1.12_firstpass
2017-07-26 19:38:35 +02:00
Richard Carter
a9b023a6b2
acceptEnergy/pullEnergy: return 0 if machine is full or empty
...
Prior to this change, the machines always updated their energy, which
involved a side check and a chunk markDirty; even if the machine is
receiving or giving 0 energy.
Right upfront, check if the machine needs no energy or has none to give,
and if so return 0.
I observed greatly increased server tick performance after this change.
2017-07-23 20:14:34 -04: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
Tom Elfring
e9957ad895
Make redstoneflux an optional dependency
2017-07-23 13:59:18 +02:00
Tom Elfring
47d1640459
Fix integer overflows
2017-06-03 13:27:15 +02:00
aidancbrady
c9cbb405d4
More API fixes
2017-04-13 16:15:26 -04:00
aidancbrady
9db5a37d4b
More ItemStack fixes, thanks @thommy101
2017-04-10 23:45:53 -04:00
aidancbrady
cf6a04a65d
Refactored energy API to play nicely with new changes
2017-03-31 16:50:11 -04:00
aidancbrady
0e9f380bd7
Forge Energy support, added full functionality for Tesla
2017-03-29 12:56:20 -04:00
aidancbrady
6a42eb64e3
Update to 1.11.2. Untested, still using outdated MCMP
2017-03-25 20:35:26 -04:00
aidancbrady
90a587383e
Merge branch 'development' into 1.9.4
...
* development:
A few minor fixes, added Ultimate Tier Installer texture
New textures, round 1.
Conflicts:
src/main/java/mekanism/generators/common/MekanismGenerators.java
src/main/java/mekanism/generators/common/block/BlockGenerator.java
2016-07-18 15:56:27 -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
53353cd050
Fixed IC2 support (still may crash without), begin adding Tesla support
2016-07-01 11:05:02 -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
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
ceec3e71e9
No more errors, the game launches, rejoice!
2016-05-26 03:14:44 -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
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
Ben Spiers
d51aa1bb44
Merge branch '1.8.9' of github.com:aidancbrady/Mekanism into 1.8.9
2016-05-12 23:58:19 +01: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
Ben Spiers
628c5865ca
Fix crashes with null capability tiles.
...
Also concerns about missing capabilities.
2016-05-07 13:38:02 +01:00