Commit Graph
66 Commits
Author SHA1 Message Date
Tom Elfring 9fc52c6016 Fix some JavaDoc warnings 2017-08-05 18:32:20 +02:00
Tom Elfring b72d6efab3 Java 7 and 8 cleanup
Diamond operator <>
Lambdas and method references
2017-08-05 17:50:38 +02: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
Tom Elfring df68b1e36a Merge remote-tracking branch 'upstream/1.11' into 1.12_firstpass 2017-07-23 13:56:41 +02:00
Aidan f590af2e04 Merge branch 'master' into master 2017-07-22 20:54:20 -07:00
Tom Elfring 5ef94efa3d Update to new RF API 2017-06-27 13:36:16 +02:00
aidancbrady c9cbb405d4 More API fixes 2017-04-13 16:15:26 -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
Lignum 0ed369c0e4 Replace 'toRemove' pattern with Iterator.remove() calls 2017-03-28 19:25:45 +02:00
aidancbrady ab5b5deb23 Several Tesla fixes 2017-03-08 19:01:43 -05:00
aidancbrady cf60a6b026 Fixed cable crash 2016-08-12 13:43:06 -04:00
aidancbrady 3992ead0ff Abstract away cable IC2 integration. Hopefully this works 2016-07-02 17:23:34 -04:00
aidancbrady fa45e1168c Fix attempt 2016-07-02 16:54:50 -04:00
aidancbrady 8ef2f57c90 Re-add part of IC2 implementation. This crashing is weird 2016-07-02 16:39:33 -04:00
aidancbrady dff99a764f Ic2 support testing 2016-07-02 16:29:50 -04:00
aidancbrady aa9b9fafb0 Fixed MCMultipart auto-download 2016-07-02 01:52:38 -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 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 eb7c2d1b78 Merge branch 'development' into 1.9.4
* development:
  Fixed Turbines unable to be formed in other dimensions
  Bump version to 9.0.2
  Fixed Personal Chest crash, bumped default Fuelwood Heater generation, added some null checks to prevent crashes
  Fixed outputting energy above Integer.MAX_VALUE to other mods, fixed tiered factories not supporting muffling upgrades, fixed boiler valve height interaction

Conflicts:
	src/main/java/mekanism/common/LaserManager.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/block/BlockMachine.java
	src/main/java/mekanism/common/entity/EntityFlame.java
	src/main/java/mekanism/common/tile/TileEntityBoilerValve.java
	src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
	src/main/java/mekanism/common/tile/TileEntityLaser.java
	src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java
	src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java
2016-05-28 02:34:55 -04: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 3983cc858b Begin the great port. 2378 errors to go! 2016-05-24 20:04:40 -04:00
aidancbrady 5fdc677926 Fixed outputting energy above Integer.MAX_VALUE to other mods, fixed tiered factories not supporting muffling upgrades, fixed boiler valve height interaction 2016-05-23 18:51:08 -04:00
aidancbrady 273e89a3b2 Get gas API completely working with capabilities 2016-05-23 13:45:17 -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 bebad0c15e Experimental new MCMultipart rewrite of transmitters.
Less changed code than expected! Nothing renders or works yet though.
2016-04-30 19:53:39 +01: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 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
Ben Spiers 4247ba136a Fix compile errors in API package 2016-01-16 14:35:01 +00:00
Ben Spiers d994f18117 Fix Railcraft engine compatibility.
For some reason they're not IEnergyProviders.
2015-07-18 21:53:19 +01:00
Ben Spiers 13221b5bf3 Remove some unused methods. 2015-04-12 00:12:18 +01:00
Ben Spiers d73eed2865 Fix the draining issue 2015-04-12 00:09:35 +01:00
Ben Spiers d14686ea2e Work on clientsiding, acceptors and things like redstone and multipart blocking. 2015-04-02 03:22:53 +01:00
Ben Spiers 47b4eb28b4 Start on refactor of entire network system.
It will hopefully make networks more robust and efficient, using lessons learned since last time I rewrote large parts of it.
We can hopefully avoid Concurrent Modification issues this way, and it should be more forgiving on chunk loads as well.
Transmitter stuff is working well, next acceptors and client rendering need tobe brought in.
2015-04-01 02:42:36 +01: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
Aidan C. Brady 03f6156d23 Minor cleanup 2015-02-16 17:20:51 -05:00
Ben Spiers 5dc0e5dca1 Merge branch 'development' into v8 2014-12-18 23:01:31 +00:00
Ben Spiers fd0bdd4da8 Efficiency of isValidAcceptor methods. 2014-12-18 22:52:45 +00:00
Ben Spiers b31aa92844 Update lots of APIs, most notably BC and an actual 1.7 version of CC
Conflicts:
	build.properties
	src/api/java/buildcraft/api/core/BlockIndex.java
	src/api/java/buildcraft/api/core/BuildCraftAPI.java
	src/api/java/buildcraft/api/fuels/IFuel.java
	src/api/java/buildcraft/api/mj/BatteryObject.java
	src/api/java/buildcraft/api/mj/IBatteryIOObject.java
	src/api/java/buildcraft/api/mj/IBatteryObject.java
	src/api/java/buildcraft/api/mj/IOMode.java
	src/api/java/buildcraft/api/mj/MjAPI.java
	src/api/java/buildcraft/api/mj/MjBattery.java
	src/api/java/buildcraft/api/power/PowerHandler.java
	src/api/java/buildcraft/api/recipes/CraftingResult.java
	src/api/java/buildcraft/api/recipes/IAssemblyRecipeManager.java
	src/api/java/buildcraft/api/recipes/IFlexibleRecipe.java
	src/api/java/buildcraft/api/recipes/IRefineryRecipeManager.java
	src/api/java/buildcraft/api/transport/IPipe.java
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/EnergyNetwork.java
	src/main/java/mekanism/common/FuelHandler.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java
	src/main/java/mekanism/common/multipart/MultipartMekanism.java
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
	src/main/java/mekanism/common/multipart/PartUniversalCable.java
	src/main/java/mekanism/common/network/PacketConfigSync.java
	src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java
	src/main/java/mekanism/common/tile/TileEntityElectricBlock.java
	src/main/java/mekanism/common/util/CableUtils.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/common/util/TransporterUtils.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
2014-11-13 19:30:39 +00:00
Ben Spiers 4d1c1285b2 Update lots of APIs, most notably BC and an actual 1.7 version of CC 2014-11-10 21:51:37 +00:00
Ben Spiers fab95e8900 Re-organise imports.
I went for what seemed like a good level of organisation:

Java
__________
Mekanism
__________
Minecraft
Forge
FML
__________
Netty
LWJGL
__________
Other APIs
__________
Static Imports.
2014-09-03 19:00:03 +01:00
Ben Spiers 0be5320143 Merge branch 'development' into 1.8
Conflicts:
	src/main/java/mekanism/common/util/MekanismUtils.java
2014-09-01 04:10:53 +01:00