Ben Spiers
3c547fa0aa
Fix factories and smelting.
2014-09-05 18:31:10 +01:00
Ben Spiers
3418438d6c
Update version to 7.1.1 due to Configurator ehancements.
2014-09-05 16:56:45 +01:00
Ben Spiers
c7a429177b
More work in the quest for greater recipe efficiency.
2014-09-05 04:20:12 +01:00
Ben Spiers
c6a77f9cfa
Fix handling of Wildcarded recipes.
...
Disadvantage of the new system is it does require checking exactly the metadata on ItemStacks that is in the recipe.
2014-09-04 04:28:44 +01:00
Ben Spiers
ce6946c669
Massive recipe system overhaul.
...
They should be much more efficient now (this reduced the tick time of the CI Chamber by 3-4x in my testing), due to being able to just use the HashMap's get() instead of being limited to iterating through entries. NEI integration code now a lot more readable and type-safe as well.
2014-09-04 04:26:55 +01:00
Ben Spiers
cb1a40a137
Try and fix the mouse binding issue.
2014-09-03 19:25:29 +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
3c62d8d7c7
Fix some machine bugs.
2014-09-03 18:25:06 +01:00
Ben Spiers
c7057114bc
Add a machine that slowly collects the ambient gas of vanilla dimensions.
...
It could do with a model I think, something like a bellows maybe?
2014-09-03 01:51:00 +01:00
Ben Spiers
fc8fab1987
Clean up Machine and Basic Blocks a bit.
...
Got rid of the direct object equality testing, and introduce enums that we can switch through when needed.
2014-09-03 00:09:47 +01:00
Ben Spiers
a01cf948ff
Add recipe and ItemBlock to plastic barriers.
2014-09-02 20:29:09 +01:00
Ben Spiers
8f6b0ce6de
Fix Portable tank fluid setting bug
2014-09-02 18:44:31 +01:00
Aidan C. Brady
99a5702de9
Cleanup - this renderer is so pretty
2014-09-02 08:08:03 -04:00
Ben Spiers
70ef6fb873
Make the Plastic Barrier coloured.
...
Still no recipe, but I'm sure we'll get to that at some point.
2014-09-02 03:22:02 +01:00
Ben Spiers
4ea93a6fa1
Add Connected textures to the opaque reactor blocks.
...
They're not very good at the moment, but they look ok.
2014-09-01 23:22:27 +01:00
Ben Spiers
7aa2617a96
Continue the attempting to be killing the bug with the fire...
2014-09-01 20:17:55 +01:00
Ben Spiers
33de5d3967
Merge branch 'experimentalCTM' into 1.8
2014-09-01 20:05:22 +01:00
Ben Spiers
6d0f8096f0
Add in support for rendering sides with overriden textures.
...
Also special facing support. Salination Plants now fully connected - the Controller texture could do with some cleaning up to improve the connected look.
2014-09-01 20:04:00 +01:00
Ben Spiers
b1a11b0ba2
Further adapt the multiblock code.
...
This will allow inter-block connected textures. I'll try and get side-specific texture overrides (eg. for the Salination Controller) working next.
2014-09-01 18:19:21 +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
26cf0ee925
Merge branch 'master' into development
2014-09-01 04:06:47 +01:00
Ben Spiers
5ae5036e62
Replace the old connected glass renderer with one adapted from Chisel.
...
I've made modifications to the original system to allow multi-meta CTM, such as between Dynamic Tanks and Dynamic Valves. This also allows texturing with effectively 5 textures, as opposed to the 47 needed previously
2014-09-01 04:03:35 +01:00
Ben Spiers
6ffb64b740
KILL #1759 THE IMPOSSIBLE BUG KILL KILL
2014-08-31 20:30:41 +01:00
Aidan C. Brady
9224d1278a
Cleanup. Great work on the sound system overhaul, @unpairedbracket! It's perfect!
2014-08-31 02:01:11 -04:00
Aidan C. Brady
ee379d7108
Added crush/enrich recipes for Fluix Dust and Crystals
2014-08-31 01:34:53 -04:00
Aidan C. Brady
98ca2315e2
Increased Gas Tank's output by a factor of 16 - it now can emit 256 units of gas per tick. This should help counter the secondary energy changes.
2014-08-30 19:29:29 -04:00
Ben Spiers
3462126f3b
Oops. Missed a loop with direct emission to BC.
2014-08-30 03:55:46 +01:00
Ben Spiers
87a692a325
Fix Sorter facing calculation.
2014-08-30 03:55:46 +01:00
Ben Spiers
a8d04828ea
Clean up some stuff using ForgeDirection's rotation matrix.
2014-08-30 03:55:46 +01:00
Ben Spiers
779759ac1e
Make the sound config options apply again.
2014-08-30 02:37:02 +01:00
Ben Spiers
05c7e63c55
Make shift not required to see contents of Portable Tanks.
...
For convenience of NEI searching.
2014-08-30 02:36:10 +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
2a52ba36af
Make SoundHandler static, remove some unneeded stuff.
2014-08-30 01:51:42 +01:00
Ben Spiers
e83f3ee042
Merge branch 'soundsystem' into 1.8
...
@aidancbrady, I got this working, might need some more refinement but
it's pretty stable
2014-08-30 00:11:14 +01:00
Ben Spiers
9db096f9bf
Pretty satisfactory implentation now, approaching point of being able to merge into 8.0.
2014-08-29 05:15:00 +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
5d346978db
Fix Sorter facing calculation.
2014-08-28 20:59:36 +01:00
Ben Spiers
e2fd40543e
Clean up some stuff using ForgeDirection's rotation matrix.
2014-08-28 20:59:22 +01:00
Ben Spiers
9294719ab2
Cleanup
...
Remove unused vars, add @Overrides, update deprecated methods.
2014-08-28 20:07:51 +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
896c943758
Cleaning up unused stuff and 3-space tabs (?)
2014-08-27 23:55:35 +01:00
Ben Spiers
da6cbeb46d
More big sound work
2014-08-27 23:16:59 +01:00
Ben Spiers
41be14fad4
Start to re-implement sound system in vanilla sounds.
...
This will make us compatible with XU mufflers (when they're) fixed and
reduce unneccesary reinvention of wheels.
2014-08-27 20:15:33 +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
ec1c02d2e5
Cleanup
2014-08-25 09:00:01 -04:00
Aidan C. Brady
6714034771
Fixed RedstoneArsenal dependency
2014-08-24 16:32:20 -04:00
Aidan C. Brady
775e1fbd6d
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java
src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
2014-08-24 09:51:12 -04:00
Aidan C. Brady
c364496212
Fixed the evil Bounding Block crash, fixed Dynamic Tank crashing when flowing icon is null
2014-08-24 09:46:38 -04:00
Aidan C. Brady
649f5b0867
Fixed a few GUI bugs
2014-08-23 15:46:13 -04:00
Aidan C. Brady
b6b6276346
Laid foundation for Industrial Turbine and Thermoelectric Boiler
2014-08-23 11:41:35 -04:00
Aidan C. Brady
2383e0477b
Merge branch 'development' into 1.8
2014-08-23 11:07:21 -04:00
Aidan C. Brady
bbef6aa2b9
A couple crash fixes
2014-08-23 11:07:03 -04:00
Aidan C. Brady
66971fd753
Implemented the new changes into TankUpdateProtocol
2014-08-22 23:12:01 -04:00
Aidan C. Brady
7e6be317af
Added prefab classes for UpdateProtocol and ThreadMultiblockSparkle, still yet to get the Dynamic Tank to extend them
2014-08-22 18:34:19 -04:00
Aidan C. Brady
8cae029ed7
Created a new prefab TileEntityMultiblock class and merged all Dynamic Tank multiblock-specific code into it.
...
Should make it much easier to create the new Steam Boiler and Steam Turbine!
2014-08-22 16:17:16 -04:00
Aidan C. Brady
55e70d5f5c
Removed println
2014-08-21 20:48:23 -04: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
Aidan C. Brady
7c09e9a47d
Merge branch 'development' into 1.8
2014-08-20 14:38:46 -04:00
Aidan C. Brady
a0622523d1
Added check for 7.0-7.1 Bin crashes
2014-08-20 14:38:11 -04:00
Aidan C. Brady
64e9996adb
no message
2014-08-20 14:06:23 -04:00
Aidan C. Brady
d24eaddee4
Added in algorithm to merge both fluid and item data of Dynamic Tank multi blocks
2014-08-20 08:49:52 -04:00
Aidan C. Brady
540eed908e
Added cache implementation of EIM
2014-08-20 08:27:44 -04:00
Aidan C. Brady
6b4ef3bb50
Merge branch 'development' into 1.8
2014-08-19 19:08:47 -04:00
Aidan C. Brady
8c58a9eaed
Fixed crash related to OreDictCache
2014-08-19 19:06:50 -04:00
Aidan C. Brady
833e0dc385
Began base implementation of the Energized Induction Matrix
2014-08-19 12:40:57 -04:00
Ben Spiers
6316ec5fd5
Fix the network fix (doEmit was always being called with tryAgain false).
2014-08-19 16:42:38 +01:00
Aidan C. Brady
ed11c63b4a
Merge branch 'development' into 1.8
2014-08-19 08:42:04 -04:00
Aidan C. Brady
a8993cb223
Only break Logistical Sorter algorithm when items are actually sent
2014-08-19 08:35:43 -04:00
Aidan C. Brady
57452a562e
Fixed a crash, also fixed the Logistical Transporter not connecting on chunk load.
...
I have absolutely no idea why, but for some reason calling isBlockProvidingIndirectPowerTo() before checking connections fixes the issue. Probably something related to chunk loading.
2014-08-18 16:10:44 -04:00
Aidan C. Brady
497af914dc
Cleanup
2014-08-18 08:48:05 -04:00
Aidan C. Brady
b657c0fb55
Fixed Diversion Transporter not rendering unlit redstone torch, forced Diversion Transporter to render center
2014-08-18 08:23:25 -04:00
Aidan C. Brady
b408154e63
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-08-17 21:36:23 -04:00
Aidan C. Brady
aa2c79672b
Began the actual implementation of PathfinderCache
2014-08-17 21:36:16 -04:00
Aidan Brady
13a88c64bf
Merge branch 'development' into 1.8
2014-08-17 15:57:03 -04:00
Ben Spiers
090bd9b9c3
Get rid of two redundant factory methods.
2014-08-17 04:18:34 +01:00
Ben Spiers
a9191fad32
Fix Dissolution Chamber upgrades.
...
Closes #1690
2014-08-16 17:22:07 +01:00
Aidan C. Brady
9b46044391
Step 1 of enormous Logistical Transmitter efficiency overhaul - the recursive inventory finder algorithm has been eliminated with the use of the InventoryNetwork's consistency.
2014-08-16 02:46:07 -04:00
Aidan C. Brady
d3b5676e43
Transmitter networks now keep track of all connected sides of acceptors. This should fix many future bugs, and it will also allow me to implement a better caching system for Logistical Transporters.
2014-08-15 16:21:58 -04:00
Ben Spiers
db3c7863fe
Cherry-pick:
...
Reduce default hydrogen energy density to match old hydrogen generator generation, by popular demand. Add comment to avoid confusion over electrolytic separator usage.
Conflicts:
src/main/java/mekanism/common/CommonProxy.java
2014-08-15 03:39:16 +01:00
Ben Spiers
73f23abc84
Reduce default hydrogen energy density to match old hydrogen generator generation, by popular demand. Add comment to avoid confusion over electrolytic separator usage.
2014-08-15 03:29:49 +01:00
Ben Spiers
8f9a2d31ee
Overhaul transmitter rendering, to make everything look a little nicer. Turn-offable by config in case people prefer the "classic" look.
2014-08-15 03:27:04 +01: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
Ben Spiers
41e118ba2e
Merge branch 'development' into 1.8
2014-08-14 23:37:28 +01:00
Ben Spiers
7813fad1ab
Make redstone-split transmitters join correctly again. Presumably this being broken is why merge() was unused.
2014-08-14 23:30:27 +01:00
Ben Spiers
e4c2692e64
Fix not sending tile updates
2014-08-14 23:05:32 +01:00
Ben Spiers
9739068822
Make Glow Plastic microblocks glow.
2014-08-13 03:37:05 +01:00
Ben Spiers
22d80c2953
Make reinforced plastic blocks actually harder and more explosion-resistant than the others
2014-08-13 03:36:47 +01:00
Ben Spiers
ddc67b475a
Microblock-enable our blocks.
...
Use IMC where custom materials aren't necessary to leave as much as possible up to CB.
2014-08-12 23:24:52 +01:00
Aidan C. Brady
237f2cbab5
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-08-11 12:31:51 -04:00
Aidan C. Brady
1833bc0796
Implemented InvTweaks API. @unpairedbracket, mind sorting out the @Optional stuff for this? I'm not sure how to do that with annotations.
2014-08-11 12:31:40 -04:00
Ben Spiers
84c13e098c
Add creative frequencies to the entangled blocks.
...
Adds the uility of being able to generate "infinite" (Integer.MAX_VALUE) amounts of fluids or gases.
2014-08-11 00:55:48 +01:00
Ben Spiers
de880c5ab0
Make Pressurized Tubes able to pull from IGasHandlers. Hopefully I didn't screw anything up too badly.
2014-08-10 03:34:01 +01:00