Commit Graph
79 Commits
Author SHA1 Message Date
aidancbrady d46e3e28b2 Cleanup, fixed transmitter wrench 2016-05-24 00:17:01 -04:00
aidancbrady 60b9db3163 Implement BlockableConnection and HeatTransfer capabilities, fixed transporter connections 2016-05-23 20:32:12 -04:00
aidancbrady 4ddcb151a1 TileNetwork capability now working in full, fixed up Logistical Transporter packet management 2016-05-23 12:34:42 -04:00
aidancbrady 87910ba233 Fixed up some capability stuff 2016-05-23 00:38:04 -04:00
aidancbrady bc1f428050 (Hopefully) fixed transmitter connections on world load 2016-05-22 19:14:45 -04:00
aidancbrady 8954baac9f Fixed Mechanical Pipe internal rendering, add Diversion Transporter and Restrictive Transporter rendering 2016-05-22 18:52:12 -04:00
aidancbrady 001c9a8d09 A few minor improvements, need to sort out capabilities for gas network 2016-05-22 01:51:48 -04:00
Ben Spiers 30510efaaa Transmitter Render Work
OBJ models are really nice to work with
2016-05-21 14:21:11 +01:00
Ben Spiers d4a6fa43be IConfigurable capability and PoC for transmitter render 2016-05-19 22:31:38 +01: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 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 918eadde7e Make transmitters kinda sorta work properly 2016-05-07 13:41:35 +01: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
Ben Spiers b08bca67d4 Merge branch 'v9' into 1.8.9 2016-02-20 22:19:34 +00:00
aidancbrady 279cccaa9b Merge branch 'development' into v9
* development:
  Fixed chunk boundary acceptor interaction
2016-02-19 18:09:14 -05:00
aidancbrady 7e9aa46fe3 Fixed chunk boundary acceptor interaction 2016-02-19 18:09:03 -05:00
Ben Spiers ac39b6fabe Merge branch 'v9' into 1.8.9 2016-02-08 14:55:27 +00:00
aidancbrady 2bea8ac29a Work on Thermodynamic Conductors 2016-02-03 11:08:36 -05:00
Ben Spiers 62e7cc8f65 Merge branch 'v9' into 1.8.9 2016-01-30 00:47:54 +00:00
aidancbrady 0a135a6936 Loads of changes to Electric Pump, Fluidic Plenisher and Transmitters
- Electric Pumps are now more efficient, upgradable, and have new config options, one of which prevents sucking of water sources (true by default)
- Fluidic Plenishers are now upgradable
- Transmitters can be upgraded by being right-clicked by alloys normally involved in crafting-based upgrading
2016-01-28 20:38:32 -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
Aidan C. Brady ec7b0555c9 Cleanup 2015-04-06 11:08:57 -04:00
Ben Spiers c13b3b240f Fix some bugs with LogiTransporters 2015-04-06 02:18:45 +01: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
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 fe8cc9d1e0 Tiered Pressurized Tubes, better tooltips, better transmitter icons 2015-03-31 17:46:09 -04:00
Aidan C. Brady a5db67e2b7 Tiered Logistical Transporters 2015-03-31 11:39:10 -04:00
Aidan C. Brady 413fac32fa Logistical Transporters now render color in glass instead of frame 2015-03-31 08:47:40 -04:00
Aidan C. Brady 0193e0b010 Hopefully drastically reduced necessary CPU time for transmitters when checking connections 2015-03-30 00:11:54 -04:00
Ben Spiers 1fe0484cd1 Fix notifyTileChanges() loading chunks. 2015-03-22 21:32:31 +00:00
Aidan C. Brady 48b895b80a Fixed cables screwing up over chunk boundaries, fixed positioning of title text on certain machines, added a few tooltips to Induction Cells & Providers 2015-03-04 13:38:41 -05:00
Aidan C. Brady c59b64f7c9 Merged changes 2015-02-19 09:15:00 -05:00
Aidan C. Brady d33af99b87 More cleanup 2015-02-16 18:11:45 -05:00
Aidan C. Brady 548145ae02 Revert "Revert "Fix some transmitter issues.""
This reverts commit e9ef6c1866.
2015-02-16 17:24:51 -05:00
Aidan C. Brady e9ef6c1866 Revert "Fix some transmitter issues."
This reverts commit f63807c75a.
2015-02-16 17:21:39 -05:00
Aidan C. Brady d8e12ca8d2 Merge branch 'development' into v8
Conflicts:
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
	src/main/java/mekanism/generators/common/block/BlockGenerator.java
2015-02-10 11:38:13 -05:00
Ben Spiers f63807c75a Fix some transmitter issues. 2014-12-27 21:09:34 +00:00
Ben Spiers bb937fdd53 Heat Transmission. 2014-12-19 04:46:23 +00:00
Ben Spiers b5e289b504 Merge branch 'development' into v8 2014-12-16 20:35:55 +00:00
Ben Spiers 9a6b3c511e Fix a silly mistake 2014-12-16 20:33:23 +00:00
Ben Spiers 19fa918daa Merge branch 'development' into 1.8 2014-11-16 23:59:33 +00:00
Ben Spiers 11fac12840 Should fix #1762. 2014-11-16 23:58:12 +00:00
Ben Spiers 5b4f154040 Giant optimise imports. 2014-11-10 21:53:29 +00:00
Ben Spiers c178f471f4 Cherry pick: Fix not sending tile updates
Conflicts:
	src/main/java/mekanism/common/multipart/PartSidedPipe.java
2014-09-07 00:26:03 +01: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