Ben Spiers
c12c54f9bf
Make the Laser Amplifier actually satisfactorily functional.
...
Redstone controls, minimum and maximum energy thresholds, and time delays all work concurrently, removing the need for distinct modes.
2014-09-16 02:47:54 +01:00
Ben Spiers
e84f176583
Add pulse mode to redstone control.
...
(I am going somewhere with this)
2014-09-16 02:47:54 +01:00
Aidan C. Brady
999e2de8e6
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/client/gui/GuiPRC.java
2014-09-15 12:19:40 -04:00
Aidan
78c9cfe3f0
Merge pull request #1823 from Mrkwtkr/patch-1
...
Update zh_CN.lang
2014-09-15 12:18:27 -04:00
Aidan
b4d3e59fa5
Merge pull request #1821 from jmongeon/GuiFixes
...
A few GUI fixes
2014-09-15 12:18:11 -04:00
Ben Spiers
4ada1ff8b7
Small laser refinements:
...
* Allow slightly larger render size.
* Stop breaking blocks *just* at the end of the laser.
* Reduce default range to 64 blocks.
2014-09-15 03:49:47 +01:00
Ben Spiers
944e288f89
Move block breaking function into LaserManager.
2014-09-15 03:47:59 +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
90f2086990
Oops.
2014-09-14 23:04:09 +01:00
Ben Spiers
f7f5e77e8e
Remove a couple of unused imports
2014-09-14 23:00:55 +01:00
Ben Spiers
7fd5a28d61
Lasers can dig blocks now.
...
They have a tendency to set the items they drop on fire, might make a
digging-specific variant later.
2014-09-14 22:57:59 +01:00
Ben Spiers
355209d2e3
Fix laser hardness crash
2014-09-14 22:44:45 +01:00
Ben Spiers
b29f2adc4d
LASERS
2014-09-14 05:20:16 +01:00
Ben Spiers
1cfaec3692
Fix imports, key handler.
2014-09-14 05:18:35 +01:00
Ben Spiers
1ad8f62627
Merge branch 'development' into 1.8
...
Conflicts:
build.properties
src/main/java/mekanism/client/MekanismKeyHandler.java
src/main/java/mekanism/common/FluidNetwork.java
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/item/ItemBlockEnergyCube.java
src/main/java/mekanism/common/item/ItemBlockGasTank.java
src/main/java/mekanism/common/item/ItemBlockMachine.java
src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
src/main/java/mekanism/common/multipart/PartSidedPipe.java
src/main/java/mekanism/common/util/MekanismUtils.java
src/main/java/mekanism/generators/common/MekanismGenerators.java
src/main/java/mekanism/tools/common/MekanismTools.java
2014-09-14 01:36:11 +01:00
Ben Spiers
930bb22b45
Fix the build failing. No idea what that was caused by but a ForgeGradle update did it.
2014-09-14 00:37:19 +01:00
Ben Spiers
5fefe0068f
Fix saving of Gas Generator Gas Tanks.
2014-09-13 23:22:15 +01:00
Mrkwtkr
4755a1cbcd
Update zh_CN.lang
...
Updated loacalization :)
2014-09-14 00:04:02 +08:00
jmongeon
b1105fb0b0
Add energy info widget to Pressurized Reaction Chamber.
2014-09-12 04:50:49 -04:00
jmongeon
6b456fba9a
Add missing energy gauge tooltip to Chemical Infuser and Chemical Oxidizer.
2014-09-12 04:38:11 -04:00
jmongeon
b558b5b6d7
Fix energy gauge in Rotary Condensentrator GUI always appearing empty.
2014-09-12 02:37:21 -04:00
jmongeon
fb9ec04ef0
Add missing energy info tab Rotary Condensentrator Gui.
2014-09-12 02:31:34 -04:00
Ben Spiers
372705a448
Make energy upgrades affect fuel usage
2014-09-12 02:06:40 +01:00
Aidan C. Brady
c512d72b06
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-09-12 01:54:14 +01:00
Ben Spiers
83d9ecaf23
Mouse button binding fixed
...
Also, make the extra info in tooltips use the sneak keybind.
2014-09-11 04:05:45 +01:00
Ben Spiers
2326048750
Merge branch 'development'
2014-09-07 00:27:45 +01:00
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