tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
770 commits 2 branches 0 tags 102 MiB
Commit graph

458 commits

Author SHA1 Message Date
Ben Spiers 65776e3516 Fix a bit of wonkiness with pipes, etc. 2013-08-23 04:19:01 +01:00
Ben Spiers 486e5aa334 Make dynamic tanks render gaseous fluids by transparency instead of level. 2013-08-22 23:55:06 +01:00
Ben Spiers f39e3a528d Fix chunk-load handler; make it refresh adjacent loaded chunks as well, to 
solve an edge case.
 2013-08-22 21:16:28 +01:00
Ben Spiers 67687cd579 I'm an idiot. 2013-08-22 21:16:27 +01:00
Aidan C. Brady 5e379f052a Merge branch 'master' of https://github.com/aidancbrady/Mekanism 
Conflicts:
	common/mekanism/api/GasNetwork.java
	common/mekanism/common/EnergyNetwork.java
	common/mekanism/common/FluidNetwork.java
	common/mekanism/common/InventoryNetwork.java
	common/mekanism/common/TileEntityEnergyCube.java
	common/mekanism/generators/common/TileEntityGenerator.java
 2013-08-22 14:07:28 -04:00
Aidan C. Brady 5072b20673 Updated IC2 API, modularized energy management 2013-08-22 11:36:31 -04:00
Ben Spiers d9c94cc0c8 Add missing import 2013-08-21 20:31:54 +01:00
Ben Spiers e598527656 Fix StackOverflowException on getNetwork. 2013-08-21 20:26:47 +01:00
Ben Spiers 19cea5b35c PowerReceiver can sometimes be null 2013-08-19 21:29:14 +01:00
Ben Spiers 18868398b4 Stop Object3D.getTileEntity() from loading unloaded chunks. 2013-08-19 18:37:36 +01:00
Aidan C. Brady 896daa10e8 Quick fix 2013-08-19 09:45:43 -04:00
Aidan C. Brady de10fa2d58 Finished new changes, canTransferGas() functionality temporarily severed 2013-08-19 07:55:47 -04:00
Aidan Brady 30f7bfa126 Loads of work on modularization, BROKEN BUILD 2013-08-18 21:32:47 -04:00
Aidan Brady 046cab7880 Base transmitter TileEntity class 2013-08-18 17:04:20 -04:00
Aidan Brady f64ea42e43 Even more modularization 2013-08-18 16:51:47 -04:00
Aidan Brady b2f20185e4 Further modularized transmitter networks 2013-08-17 13:32:05 -04:00
Aidan C. Brady 20728eff4f Began work on a more modular approach to networks 2013-08-16 11:56:42 -04:00
Aidan C. Brady 98a436d2f7 Cleanup 2013-08-16 11:50:58 -04:00
Aidan C. Brady 38e772107c Merged NEI module, bumped version 2013-08-14 11:01:44 -04:00
Ben Spiers 2389d3d864 Re-add and update NEI plugin to work again 2013-08-10 20:52:59 +01:00
Aidan Brady 9fae571278 Remove dead code 2013-08-08 13:13:19 -04:00
Aidan Brady 6ce44658ad Merge branch 'master' of https://github.com/aidancbrady/Mekanism 
Conflicts:
	common/mekanism/common/EnergyNetwork.java
	common/mekanism/common/ItemBlockEnergyCube.java
	common/mekanism/common/LinkedPowerProvider.java
	common/mekanism/common/TileEntityUniversalCable.java
	common/mekanism/generators/common/TileEntityGenerator.java
 2013-08-08 13:11:25 -04:00
Aidan Brady 8996b499e3 Merging with other computer 2013-08-08 13:10:11 -04:00
Aidan Brady 7e167b753a Logistical Transporters now have complete network functionality. Actual item transport is the next step! 
Also fixed various network bugs. :)
 2013-08-06 01:40:41 -04:00
Aidan Brady fe9cd85564 Work on Logistical Transporter 2013-08-05 23:58:44 -04:00
Aidan Brady 96b192efef General rendering improvements 
*Faster gas rendering in Pressurized Tube.
*Lava now glows when in Dynamic Tank.
*Mechanical Pipes won't visually connect to Dynamic Valves when not part of a multiblock structure.
*Fixed energy cube GUI "Inventory" text color, fixed energy cube GUI energy scale bar.
 2013-08-05 18:58:24 -04:00
Aidan Brady 2553bb40c1 Minor Electric Pump container fix, cleanup 2013-08-05 03:55:17 -04:00
Aidan Brady 7f45043dec Minor dynamic tank logic fix 2013-08-04 03:33:40 -04:00
Aidan Brady aa69ba4bdf Fix cast 2013-08-03 23:59:24 -04:00
Aidan Brady ffd2588a63 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-08-03 23:02:31 -04:00
Aidan Brady 3fd76dcacc Began work on Logistical Transporter - item transport :) 2013-08-03 23:02:06 -04:00
Ben Spiers befd4ad4e2 I need to stop leaving those in. 2013-08-04 02:07:57 +01:00
Ben Spiers 472050e296 So apparently kilojoules are the base unit now. OK. 2013-08-04 01:58:56 +01:00
Ben Spiers 49fc056c8c My approach to Universal Cables rendering power. They render with 
transparency proportional to the base 10 log of power, to compensate
for the wide range of power that can be transmitted, and minimise client
update packets.
 2013-08-04 01:58:56 +01:00
Ben Spiers 8ee17b2a03 Bring other network types up to speed with EnergyNetwork 2013-08-04 01:58:56 +01:00
Ben Spiers 837689a061 Transmitter Network Interface 2013-08-04 01:58:56 +01:00
Aidan Brady 503c4eb0b5 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-08-02 03:16:56 -04:00
Aidan Brady 47c36f1f38 Added redstone control to machines, generators, Energy Cubes and Gas Tanks; fixed Heat Generator NBT bug 
Also - cleanup! Closes #214.
 2013-08-02 03:16:38 -04:00
Ben Spiers 534234abb2 Should fix robit crash when placed on non-chargepad tileEntities 2013-08-01 23:49:38 +01:00
Ben Spiers f48997a793 Merge branch 'master' of github.com:aidancbrady/Mekanism 
Conflicts:
	common/mekanism/client/ModelRendererSelectiveFace.java
 2013-08-01 23:30:59 +01:00
Ben Spiers 0d99b90922 Add a nullcheck that was crashing someone. 2013-08-01 23:15:02 +01:00
Ben Spiers 04e7fdcf23 Make the transmitters' internal renders look a bit nicer (hopefully also a bit 
faster). Framework is in place to change transparency of energy in cables
but the client-side ones don't know what they're doing yet.
 2013-08-01 23:14:26 +01:00
Ben Spiers c642792cb6 Use DisplayInteger to abstract away some GL11 calls 2013-08-01 23:03:43 +01:00
Aidan Brady 55bde8a4b9 There is now a configurable delay between state updates, closes #177 2013-08-01 12:07:03 -04:00
Aidan Brady 9e51cdd4bc Fixed Energy Cube/Generator UE energy outputting 2013-08-01 11:23:07 -04:00
Aidan Brady 773f40717c Minor Robit AI enhancements 2013-08-01 01:28:27 -04:00
Aidan Brady 768f76e364 Fixed Robit crashing, added EnergyMeter recipe to master 2013-08-01 01:01:39 -04:00
Aidan Brady ec42d430df Fixed Forestry integration 2013-08-01 00:50:18 -04:00
Aidan Brady 333896bcac Merge branch 'master' of https://github.com/aidancbrady/Mekanism 
Conflicts:
	common/mekanism/client/ModelBoxSelectiveFace.java
	common/mekanism/client/ModelRendererSelectiveFace.java
 2013-08-01 00:08:45 -04:00
Aidan Brady d56eed2204 Cleanups! 2013-07-31 23:54:08 -04:00
Ben Spiers 260b9ed62f Stop the new renderer from just creating infinite new displaylists. 2013-08-01 03:14:57 +01:00
Aidan Brady 7bbcc1c178 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-07-31 21:20:50 -04:00
Aidan Brady 4c50c442d1 Better BC item integration, javadocs, cleanup 2013-07-31 21:20:12 -04:00
Ben Spiers 415360a293 Fix factory guis 2013-08-01 00:04:00 +01:00
Ben Spiers 1b64d077e4 @Aidancbrady, why did osmium armour think it's made of diamond? I've 
changed it because it was messing with the textures.
 2013-07-31 23:34:39 +01:00
Ben Spiers 7c71adc9d2 Well, I don't know why the old way was broken but it's fixed now. 2013-07-31 23:34:39 +01:00
Ben Spiers 423db88959 Transmitter rendering improvements. 
Now uses a new, slightly modified ModelRenderer and ModelBox I adapted
to be able to selectively render faces. Also we can now turn off back-face
culling without any xyz-fighting.
 2013-07-31 23:34:38 +01:00
Aidan Brady 0b5d188cd7 More ratio fixes, Electric Chest GUI now has energy tooltip 2013-07-31 17:00:30 -04:00
Aidan Brady fc964ad8db Cleanups, fixed UE ratios 2013-07-31 16:44:53 -04:00
Aidan Brady 1953e16b5a Merge branch 'master' of https://github.com/aidancbrady/Mekanism 
Conflicts:
	common/mekanism/common/TileEntityUniversalCable.java
 2013-07-31 11:59:49 -04:00
Aidan Brady c389f5bd34 Updated to new BuildCraft API, Universal Cable BuildCraft support temporarily broken. 2013-07-31 11:54:58 -04:00
Ben Spiers 248a976593 Possible hotfix for optifine crash 2013-07-31 03:31:37 +01:00
Ben Spiers 60d9ac6d01 Oops. 2013-07-29 23:17:52 +01:00
Ben Spiers b3909b7e6e Add debug info to EnergyMeter 2013-07-29 22:52:31 +01:00
Ben Spiers 30ca7d82d6 Add ability to manually force-fix a network using a configurator 2013-07-29 22:48:12 +01:00
Ben Spiers b01cf3b8f7 Make it so that /mk is always available in SSP 2013-07-29 21:38:10 +01:00
Ben Spiers 18519b5fa6 Fix the EnergyNetwork memory leak. 2013-07-29 21:30:43 +01:00
Ben Spiers c2c031ef2a Clean up a bit of unnecessary logic 2013-07-29 21:06:01 +01:00
Ben Spiers 735b281341 Fix a little derp in getPower() 2013-07-29 21:03:31 +01:00
Ben Spiers 6a562117b6 Fix ArrayIndexOutOfBoundsException in Electric Chest when attached to AE import buses and presumably other things. 2013-07-29 21:02:36 +01:00
Aidan Brady db5588ddb9 Fixed StackOverflowException with MFR, fixed incorrect UE charging values 2013-07-27 19:32:46 -04:00
Aidan Brady dedb2ebdcf Fixed ControlCircuit recipe bug 2013-07-27 12:01:08 -04:00
Aidan Brady db8725e1a4 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-07-26 18:16:28 -04:00
Aidan Brady 5d26f8e229 Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
Ben Spiers 734835e695 Hopefully prevent potential (race condition?) NPE in osmium compressor. 2013-07-24 21:05:41 +01:00
Aidan Brady 13400fdc3d Bumped version to 5.5.7 2013-07-20 12:35:37 -04:00
Aidan Brady cd53a8b4db Re-commit Dynamic Tank fix 2013-07-20 12:17:58 -04:00
Aidan Brady 26e86c8eee Merge branch 'master' of https://github.com/aidancbrady/Mekanism 
Conflicts:
	common/mekanism/client/RenderMechanicalPipe.java
	common/mekanism/common/BlockBasic.java
 2013-07-20 12:15:34 -04:00
Aidan Brady cfc5dff445 First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
Ben Spiers ec9d74fe1a Hopefully solve all the rendering-based memory leaks 2013-07-19 19:59:01 +01:00
Ben Spiers 14c56c6041 Fix infinite liquid dupe bug. 2013-07-18 02:25:02 +01:00
Ben Spiers 92c3cb6811 Fix Mechanical Pipe non-vanilla liquid rendering. Closes #186 2013-07-17 20:01:16 +01:00
Aidan Brady 1b039bce4b Tiny cleanup 2013-07-08 18:58:26 -04:00
Aidan Brady 3f8deb946a Re-enabled face culling, re-fixed getPickBlock() 2013-07-08 18:52:03 -04:00
Ben Spiers 745f7d1f44 Hopefully re-fix #152 2013-07-08 23:38:53 +01:00
Ben Spiers e50701da02 Hopefully fix NPE with Immibis' microblocks and avoid issue #152 recurring 2013-07-08 23:03:02 +01:00
Ben Spiers 73627f675a Make transmitters drop when shift-wrenched, like TE conduits 2013-07-08 20:47:10 +01:00
Ben Spiers b2c32527c6 Add canWrench() checks to Block classes' onBlockActivated() methods 
to fix the mmMPS powerFist always rotating Mekanism machines.
 2013-07-08 20:43:28 +01:00
Aidan Brady c27f4d06bc Git always finds a way to screw things up, re-added new transmitter renderer 2013-07-08 12:41:31 -04:00
Aidan Brady b313f0f96e Slightly better transmitter rendering, better energy cube outputting 2013-07-08 12:06:39 -04:00
Aidan Brady 1468fc05bd Fixed Universal Cable render 2013-07-07 13:22:24 -04:00
Aidan Brady ce09a8225f Formatted EnergyMeter PR, merged Energy Cube comparator support 2013-07-07 13:07:40 -04:00
Aidan 3ea43f6f64 Merge pull request #179 from unpairedbracket/power-squashed 
Add Power Reading to EnergyMeter
 2013-07-07 09:58:31 -07:00
Aidan Brady 540823ef4a Removed Wind Turbine bound checking 2013-07-07 12:17:51 -04:00
Aidan Brady bc4a34c189 Less client-based lag on machines and generators 2013-07-07 12:13:52 -04:00
Aidan Brady 37e442c17b Removed "upgrade dump" configurator mode, upgrades can now be removed in GUIs 2013-07-06 21:33:08 -04:00
Aidan Brady 0fb90be4c7 Crusher sound volume decreased, upgrades now sustained in recipes 2013-07-06 17:01:13 -04:00
Ben Spiers 6183761f68 Add an EnergyNetworkRegistry to keep track of Energy Networks and act as a singleton tick handler. 2013-07-06 03:14:33 +01:00
Ben Spiers 1241fa18a9 Refactor EnergyNetwork.split() to make sure lots of unneeded networks aren't created 2013-07-06 02:42:41 +01:00
Ben Spiers b740f05079 Add power recording to networks and display to EnergyMeter 2013-07-05 18:39:54 +01:00
Ben Spiers 49fcac6d3c Use ElectricityDisplay for human-readable EnergyMeter units. 2013-07-05 17:52:47 +01:00
Aidan Brady 7df5888bd3 Added EnergyMeter 2013-07-02 19:03:03 -04:00
Aidan Brady 17d4acf389 Fixed IC2 integration, minor cleanup 2013-07-02 13:25:56 -04:00
Aidan Brady 29749ca510 Containers can now be accessed anywhere 2013-06-29 23:19:46 -04:00
Aidan Brady 52ceee1259 Mechanical Pipe crash fix, Dynamic Tank GUI fix 2013-06-29 23:06:24 -04:00
Aidan Brady a667f9a3b6 v5.5.6 Beta #24 
*Removed Mechanical Pipe & Universal Cable redstone toggle.
*Fixed render crash.
*Fixed version println.
 2013-06-29 17:24:54 -04:00
Aidan Brady 8f6ad2688e General cleanup 2013-06-28 19:43:45 -04:00
Aidan Brady b255a98a74 Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00