Aidan C. Brady
d432fc979c
Merge branch 'master' into development
2015-02-24 08:40:19 -05:00
Ben Spiers
dd404b4209
Let's try that again, shall we? Reimplement redstone checks to not load chunks.
2015-02-20 13:56:36 +00:00
Aidan C. Brady
2fe4cf290d
Merge branch 'master' into development (@unpairedbracket, make sure I did this right)
...
Conflicts:
src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
src/main/java/mekanism/common/util/MekanismUtils.java
2015-02-19 16:12:28 -05:00
Ben Spiers
17f9f88b34
Prevent Osmium Compressor and Combiner from using secondary energy upgrades.
...
Also make them deterministic again to prevent them getting stuck
2015-02-19 16:36:16 +00:00
Aidan C. Brady
cb377f88ab
Fixed duplicate method
2015-02-19 09:15:56 -05:00
Aidan C. Brady
f67c048e78
Merge branch 'master' into development
...
Conflicts:
src/main/java/mekanism/common/multipart/PartSidedPipe.java
2015-02-19 09:15:30 -05:00
Aidan C. Brady
c59b64f7c9
Merged changes
2015-02-19 09:15:00 -05:00
Aidan C. Brady
0819c0ad5f
Hopefully fixed the transmitter network halt issue. Provide feedback!
2015-02-19 09:13:03 -05:00
Aidan C. Brady
25df777b84
Work on fusion fuel creation mechanics, allowed Chemical Washer to accept upgrades
2015-02-17 21:27:35 -05:00
Aidan C. Brady
03f6156d23
Minor cleanup
2015-02-16 17:20:51 -05:00
Aidan C. Brady
0612712abe
Fixed energy cubes not outputting items
2015-02-11 08:43:32 -05:00
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