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
32b3a5b0ac
Fix some potential NPE problems.
2014-09-07 00:15:23 +01:00
Ben Spiers
bafdb18756
Fix Gas Tanks filling from the wrong type of gas.
...
(eg. in a Chemical Injection Chamber.)
2014-09-07 00:15:00 +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
3160ec0691
Cleanup imports again.
2014-09-05 18:32:54 +01:00
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
9d1dcdfc72
Merge branch 'development'
2014-09-05 16:48:41 +01:00
Ben Spiers
29c94f9dd8
Use package-info files and @API annotations.
2014-09-05 04:22:36 +01:00
Ben Spiers
573b60de04
Turns out the itemid can change on world load.
...
Use the unlocalised name instead as this should be constant. Anyone using the stack size in the unlocalized name method should be shot.
2014-09-05 04:22:04 +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
d78e16e954
Try and fix the mouse binding issue.
2014-09-03 19:51:50 +01:00
Ben Spiers
4dd3d4ba01
I think this will prevent a potential memory leak.
2014-09-03 19:49:47 +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
215cebb143
Remove unused internal class
2014-09-02 18:44:31 +01:00
Ben Spiers
8f6b0ce6de
Fix Portable tank fluid setting bug
2014-09-02 18:44:31 +01:00
Ben Spiers
c21404dd2d
Make the tank-type renderers reset their DisplayLists on texture reload.
...
This will prevent missing-texture/wrong-texture weirdness when changing texturepacks in-world. Also noticed that two old render classes from my first rewrite of transmitter rendering are now unused, so deleted them.
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
999fe7719f
Continue the attempting to be killing the bug with the fire...
2014-09-01 20:19:19 +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
f71b7e1e48
Wrote some tooltips!
2014-08-31 02:09:51 -04: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
1ba5665e07
Fix indent.
2014-08-30 02:54:19 +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
1215b50e06
Fix config option.
2014-08-30 01:53:29 +01:00
Ben Spiers
94ca605b48
Remove some deprecation.
2014-08-30 01:51:53 +01:00
Ben Spiers
2a52ba36af
Make SoundHandler static, remove some unneeded stuff.
2014-08-30 01:51:42 +01:00
