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

137 commits

Author SHA1 Message Date
Ben Spiers
385a1d29f6 Make a start on the boiler. 
It's currently causing odd issues with the heat simulator and has various issues such as balance not existing yet.
Also improve the specification of a load of the multiblock generics to reduce needless casting.
 2015-01-08 05:26:53 +00:00
Ben Spiers
ccf7a37b22 Make HeatUtils not take unnecessary arguments. 2014-12-27 21:08:18 +00:00
Ben Spiers
8a4aaff44a Move standard simulation method into a Utils class. 2014-12-22 19:38:03 +00:00
Ben Spiers
ab2a7cb6c7 Improve temperature colours to allow for different base colours. 
Make a start on insulation.
Code the characteristics of air into static IHeatTransfer variables.
 2014-12-22 19:14:55 +00: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
49be30de34 Merge branch 'development' into v8 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
	src/main/java/mekanism/common/tile/TileEntityFactory.java
	src/main/java/mekanism/common/util/MekanismUtils.java
 2014-12-14 19:04:03 +00:00
Ben Spiers
a91dcc49d4 Introduce statistical consumption of gases. 2014-12-14 18:10:46 +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
5b4f154040 Giant optimise imports. 2014-11-10 21:53:29 +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
Aidan C. Brady
60bf7f5f3d Merge branch 'development' into 1.8 (gosh darn conflicts) 
Conflicts:
	src/api/java/ic2/api/Direction.java
	src/api/java/ic2/api/energy/NodeStats.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/block/BlockMachine.java
	src/main/java/mekanism/common/tile/TileEntityElectricBlock.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/generators/common/block/BlockGenerator.java
 2014-10-17 12:00:39 -04:00
Ben Spiers
b25d8f673b Only use the EnergyNet-related interfaces if IC2 itself is loaded. 
Also add some extra safety to useIC2().
Conflicts:
	src/main/java/mekanism/common/util/MekanismUtils.java
 2014-10-02 18:54:30 +01:00
Aidan C. Brady
ed8823b038 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/Mekanism.java
 2014-10-02 12:47:22 -04:00
Ben Spiers
5d08726880 Add config options to blacklist the different power systems. 
This should help people avoid IC2 problems with console spam, but such a "solution" only relieves the most obvious symptom of chunk-thrashing, it doesn't stop the thrashing itself.
 2014-09-30 20:40:18 +01:00
Ben Spiers
e7f3204ed7 Fix a tesseract fluid issue. 2014-09-30 20:24:04 +01:00
Aidan C. Brady
9bf4baab49 Merge branch 'development' into 1.8 (hopefully I didn't miss anything) 
Conflicts:
	src/main/java/mekanism/client/gui/GuiGasTank.java
	src/main/java/mekanism/client/gui/GuiPortableTeleporter.java
	src/main/java/mekanism/client/gui/GuiTeleporter.java
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/content/transporter/TransporterStack.java
 2014-09-27 14:40:25 -04:00
Porter Westling
93f5c8a797 compare stack tags as well as item id 2014-09-22 15:05:16 -07:00
Ben Spiers
e84f176583 Add pulse mode to redstone control. 
(I am going somewhere with this)
 2014-09-16 02:47:54 +01:00
Ben Spiers
44d852ee9b I accidentally a linear autominer. 
Might make a really basic laser redirection block next - none of the refined controls of the Amplifier, none of the collection abilities of the Tractor Beam.
 2014-09-15 02:11:55 +01:00
Ben Spiers
372705a448 Make energy upgrades affect fuel usage 2014-09-12 02:06:40 +01:00
Ben Spiers
b75ff5d9a1 Cache all the things. 
(Provided those things are computationally expensive to recalculate, and the memory cost of caching them is less than the time cost of recalculating them each time.)
 2014-09-06 21:14:49 +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
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
Ben Spiers
3462126f3b Oops. Missed a loop with direct emission to BC. 2014-08-30 03:55:46 +01:00
Ben Spiers
0d77240289 Add lang utility methods to localise FluidStacks, use them throughout the codebase. 2014-08-30 02:34:50 +01:00
Ben Spiers
c71c5d9fe7 Fix integer conversion 2014-08-29 03:14:00 +01:00
Ben Spiers
514b6962d2 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntitySalinationController.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/generators/common/block/BlockGenerator.java
 2014-08-28 22:18:31 +01:00
Ben Spiers
e16a39912e Configurator Overhaul. Modes now more accurately descriptive. 
Now only configurates in mode 0, mode 1 unchanged, mode 2 only
rotates and mode 3 acts as a buildcraft wrench.
 2014-08-28 19:59:50 +01:00
Ben Spiers
e0fc1194e1 Revert "Fix I goofed." 
This reverts commit 39509fc133.
 2014-08-28 03:29:42 +01:00
Ben Spiers
52b52e1c2e Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java
 2014-08-28 03:29:11 +01:00
Ben Spiers
39509fc133 Fix I goofed. 2014-08-28 03:13:11 +01:00
Ben Spiers
dd3ae67750 Fix some pretty severe plenisher problems that must have gone a while relatively unnoticed. 2014-08-28 03:12:58 +01:00
Ben Spiers
96072e0f5e Merge branch 'development' into 1.8 2014-08-27 02:19:42 +01:00
Ben Spiers
40c06f1004 Fix secondary energy consumption with speed upgrades. 
Might make them less efficient with speed upgrades and add a secondary
energy upgrade that mitigates this, like the current energy upgrade.
 2014-08-27 02:17:45 +01:00
Aidan C. Brady
f87cc4a1e3 Logistical Transporter path caching. 
I managed to take the average path calculation time down from 4-8 milliseconds to 100-200 microseconds. All in a day's work!
 2014-08-21 20:46:51 -04:00
Aidan C. Brady
80021dd4c7 Work on path caching 2014-08-20 15:54:05 -04:00
Aidan C. Brady
275c7840cc Reorganized package structure to separate content from base code 2014-08-20 15:22:55 -04:00
Ben Spiers
3fcce24bac Move client configs to their own category, with new gui screen to match. 2014-08-15 02:58:44 +01:00
Aidan Brady
1d6de974d3 A bit of package reorganization, added InventoryNetwork to transporters 2014-08-09 22:20:49 -04:00
Aidan C. Brady
ef9741af7f Fixed cable functionality 2014-08-09 13:29:04 -04:00
Aidan C. Brady
a3c6b9dac2 Fixed cable functionality 2014-08-09 13:28:40 -04:00
Aidan C. Brady
3b53614bd2 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityDynamicTank.java
	src/main/java/mekanism/common/tile/TileEntitySalinationValve.java
	src/main/java/mekanism/common/util/CableUtils.java
 2014-08-08 22:11:45 -04:00
Aidan Brady
a0b8ab0331 Quick cleanup 2014-08-08 21:25:59 -04:00
Aidan C. Brady
6ff0a147e4 More fixes 2014-08-08 00:00:33 -04:00
Aidan Brady
fc7dd3e65a Started on a new, more modular approach to controller-less multiblocks, allowing for the creation of the EIM 2014-08-01 13:04:31 -04:00
Aidan Brady
d9bb5845cd Naming standards :) 2014-07-31 20:55:01 -04:00
Ben Spiers
725b7463f0 Make the mod classes significantly less godlike. 
Move Config variables into their own class, (in api because other stuff in API references config, may make sense to move it back to common later), and move Blocks and Items into final variables in their own classes. It looks a lot cleaner this way and my OCD can finally rest now.
 2014-08-01 01:35:06 +01:00
Aidan Brady
da35b509fd Creative Energy Cube now won't be drained of or receive power. 2014-07-31 19:19:03 -04:00
Ben Spiers
d7c060d6fb Update BC API and fix up EnergyNet and CableUtils to work with the new MjAPI 2014-07-31 18:41:32 +01:00
Ben Spiers
4faa733106 Merge branch 'development' into 1.8 2014-07-31 15:59:30 +01:00
Ben Spiers
59dab7c848 Move StackUtil to api package for not causing errors. 2014-07-31 15:58:02 +01:00
Ben Spiers
d4f05c8b99 Some cleanup of MekanismUtils and more EnergyDisplay changes to use our energy units. 
Because who the hell ever uses siemens, anyway?
 2014-07-31 15:55:03 +01:00
Ben Spiers
9413950842 Merge branch 'development' into 1.8 2014-07-28 17:33:38 +01:00
Ben Spiers
c97464649d Fix trying to use IC2 EnergyNet without IC2 installed. It would never work anyway. 2014-07-28 17:20:31 +01:00
Ben Spiers
cf4df0941b Fix a crash casting null to float 2014-07-28 15:05:53 +01:00
Aidan C. Brady
d8e94b00d2 Added effect information to upgrade GUI 2014-07-23 11:06:58 -04:00
Aidan C. Brady
52efdac614 Eliminated the deprecated "getSpeedMultiplier()" and "getEnergyMultiplier()" methods 2014-07-23 10:17:03 -04:00
Aidan C. Brady
65a8633441 Gave Chemical Oxidizer and PRC upgrade systems, fixed Chemical Oxidizer and Electrolytic Separator NEI modules 2014-07-10 22:28:04 -04:00
Aidan C. Brady
fc878661d5 Implemented new container edit modes in Portable Tank and Dynamic Tank, still need to set up IFluidContainerItem integration with the Dynamic Tank 2014-07-10 18:08:53 -04:00
Aidan C. Brady
12f3ef8665 Lay out the foundation for container edit modes. Also changed the way Dynamic Tank caches work - they are now much more modular and will remember their multiblock inventories on world reload. 2014-07-10 17:51:26 -04:00
Aidan C. Brady
1f9782d1c7 Added logic to allow fluid-accepting machines to use IFluidContainerItem fluids 2014-07-10 16:24:55 -04:00
Ben Spiers
cd10bc88c8 Updates for changed IC2 API. Not sure if I'll be able to use @Optional with the new non-legacy BC MJ API as it uses Annotations instead of interfaces. 2014-07-10 16:53:01 +01:00
Aidan C. Brady
83ff761ec4 Fix a bug with takeTopItem() inventory management. This fixed it, @ErogenousBeef! 2014-07-07 18:21:22 -04:00
Ben Spiers
ac223c8df5 Fix ic2 pulling and IConfigurable passthrough (leaving the OreDict fix for the Pull Request). getConnectedOutputters was broken. 2014-06-26 23:47:33 +01:00
Ben Spiers
9c58ed549f Start of work on Doing It Right™. Appears to work for cofh's API, not yet for IC2 or BC. Not sure why. Might have to ask @cpw. 2014-06-26 01:10:53 +01:00
Aidan C. Brady
cf1469c7da Fix weird blending issue with Dynamic Glass, gave Seismic Vibrator an on texture 2014-06-19 15:44:08 +02:00
Aidan C. Brady
fba83a3634 Fluidic Plenisher work - just about done! 2014-06-19 13:57:30 +02:00
Aidan C. Brady
adc8a9bc23 Portable Buckets...a lot more work than I thought 2014-06-18 19:42:57 +02:00
Aidan C. Brady
90c1c690a9 Updated Cofh API 2014-06-15 13:35:51 +02:00
Aidan C. Brady
1a0821c727 Found work-around for javac issue - need to remember to submit an issue to oracle tomorrow 2014-06-14 01:35:25 +02:00
Aidan C. Brady
70abe40b1f Mod ID filters :) 2014-06-13 20:58:50 +02:00
Aidan C. Brady
c8fb800c1a Updated localization yet again, fixed a small bug 2014-06-13 00:16:02 +02:00
Aidan C. Brady
e5f76907ce Rewrite networking code for the 100th time to fix memory leak 2014-06-11 11:57:49 +02:00
Aidan C. Brady
d7fdc3a243 Greatly improved localization 2014-06-10 11:35:54 +02:00
Aidan C. Brady
b365494f2e Fixed up logger, added needed overlays 2014-06-03 08:46:03 +02:00
Aidan C. Brady
4446e14ba3 Sound system work 2014-06-02 23:57:40 +02:00
Aidan C. Brady
295efab7b2 More error fixes, down to 11! 2014-06-02 20:04:10 +02:00
Aidan C. Brady
ec2040cccc Work on networking update 2014-06-01 17:42:23 +02:00
Aidan C. Brady
8be5ecf140 Down to 215 errors, pretty much everything is packets now 2014-05-30 23:49:24 +02:00
Aidan C. Brady
d1c193d0dd Loads more work. 275 errors. 2014-05-29 19:01:43 +01:00
Aidan C. Brady
6f69c6d7b4 Major 1.7 work, down to a little more than 500 errors 2014-05-29 17:55:47 +01:00
Aidan Brady
7496ac7648 Some 1.7 work. Just about 800 errors! 2014-05-07 16:37:58 -04:00
Ben Spiers
3d8c5c8696 More fixes. Around 1000 errors now, going to have to leave it to you from here on in @aidancbrady. 2014-04-20 22:34:45 +01:00
Ben Spiers
31938e8b68 Under 1300 errors left now, started on packet/network stuffs. 2014-04-20 21:15:44 +01:00
Ben Spiers
db7121454a Re-add an updated ic2, alter CC and update DepLoader. Fix more of the things. 
1792 errors. A good night's work, I think.
 2014-04-20 04:34:19 +01:00
Ben Spiers
ab47724473 Move the directory structure around to a more conventional one and start out on the 1.7 update. 
3797 errors. We have a long way to go.
 2014-04-20 03:44:06 +01:00