aidancbrady
5bd67b37b2
Fixed IC2 integration
2017-07-31 19:41:24 -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
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
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
Ben Spiers
384cf174bb
Get capabilities off the ground
2016-05-04 12:45:12 +01:00
Ben Spiers
185ea3c4d8
Experiments with Capabilities.
2016-05-01 23:10:47 +01: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
Ben Spiers
1a01d5e217
Get a lot more rendering working
2016-02-09 00:14:46 +00:00
Ben Spiers
7b4fefeb60
Fix some of the things that were broken, add more type-specs.
2016-02-08 22:46:06 +00:00
Ben Spiers
a27c9b6839
tile package done, except for TEDigitalMiner
2016-01-25 04:36:00 +00:00
Ben Spiers
0f40514cc7
Merge branch 'v9' into 1.8.9
2016-01-23 13:50:43 +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
aidancbrady
afe8969c37
Added energy management to turbine and turbine valves
2016-01-23 00:40:30 -05:00
Ben Spiers
4247ba136a
Fix compile errors in API package
2016-01-16 14:35:01 +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
87b7b838f0
Induction Matrix now caps input based on provider transfer cap, displays input rate data in both main and stats interfaces
2015-07-06 13:55:40 -07:00
aidancbrady
9ffc1bdff3
Localization fixes, part 1
2015-05-10 19:04:42 -04:00
Ben Spiers
7a2461540f
Merge branch 'development' into networkRefactor.
...
Hopefully I didn't miss anything
Conflicts:
src/main/java/mekanism/api/gas/GasNetwork.java
src/main/java/mekanism/client/render/RenderPartTransmitter.java
src/main/java/mekanism/common/EnergyNetwork.java
src/main/java/mekanism/common/FluidNetwork.java
src/main/java/mekanism/common/InventoryNetwork.java
src/main/java/mekanism/common/content/transporter/TransporterStack.java
src/main/java/mekanism/common/multipart/PartHeatTransmitter.java
src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
src/main/java/mekanism/common/multipart/PartMechanicalPipe.java
src/main/java/mekanism/common/multipart/PartPressurizedTube.java
src/main/java/mekanism/common/multipart/PartSidedPipe.java
src/main/java/mekanism/common/multipart/PartUniversalCable.java
src/main/java/mekanism/common/util/MekanismUtils.java
src/main/java/mekanism/common/util/PipeUtils.java
2015-04-03 19:45:25 +01:00
Ben Spiers
d14686ea2e
Work on clientsiding, acceptors and things like redstone and multipart blocking.
2015-04-02 03:22:53 +01:00
Aidan C. Brady
f9070f33d0
Fixed Induction Matrix not outputting properly
2015-03-24 21:43:22 -04:00
Ben Spiers
01f37e552e
Make induction ports work with connected textures.
2015-03-17 23:49:45 +00: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
Aidan C. Brady
9260414177
Finished implementing Induction Matrix core functionality, just about everything works! Need to redesign GUI to include separate gauge for output rate
2015-03-03 18:18:32 -05:00