Ben Spiers
9a47f800f9
Merge branch 'development' into v8
...
Conflicts:
src/main/java/mekanism/client/ClientProxy.java
2014-12-15 00:05:39 +00:00
Ben Spiers
ee585c05dc
Make glowing plastic blocks glow.
2014-12-15 00:02:22 +00:00
Ben Spiers
5b4f154040
Giant optimise imports.
2014-11-10 21:53:29 +00: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
b29f2adc4d
LASERS
2014-09-14 05:20:16 +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
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
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
779759ac1e
Make the sound config options apply again.
2014-08-30 02:37:02 +01:00
Ben Spiers
2a52ba36af
Make SoundHandler static, remove some unneeded stuff.
2014-08-30 01:51:42 +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
896c943758
Cleaning up unused stuff and 3-space tabs (?)
2014-08-27 23:55:35 +01: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
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
Aidan Brady
c66f3a44b7
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-08-09 22:20:59 -04:00
Aidan Brady
1d6de974d3
A bit of package reorganization, added InventoryNetwork to transporters
2014-08-09 22:20:49 -04:00
Ben Spiers
191d964003
More Entanglement work. Now has a gui, can set it's frequency.
2014-08-10 02:17:02 +01:00
Ben Spiers
40659dcdac
Very start of a working teleportation system. Works for Energy and Fluids, probably Gases. Not Items yet.
2014-08-09 02:08:38 +01:00
Ben Spiers
14852b0b5d
Move some more code into the Blocks and Items classes, and fix the ObjectHolder annotations. Don't think it's going to be possible to make the Tools items work with ObjectHolder (they'd need to be final fields I think) because the material enums need to be initialised first.
2014-08-03 20:27:20 +01: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
Ben Spiers
b62c5c8a3a
Get basic functionality working for the Laser Amplifier. No mode changing yet, and using the laser model in lieu of the actual one.
2014-07-30 22:26:03 +01:00
Aidan C. Brady
aaffc3e364
Updated some imports and added textures
2014-07-26 16:45:48 -04:00
Aidan C. Brady
22b3097d15
Laser model! Also added some new Reactor Block assets.
2014-07-24 23:02:30 -04:00
Ben Spiers
775ba68482
Tweaking of lasers for packet-efficiency
2014-07-22 22:34:19 +01:00
Ben Spiers
327389a88c
Get Lasers kind of working vs. dediservers
2014-07-22 21:11:43 +01:00
Ben Spiers
dd421f7308
This should stop the servercrashing issue
2014-07-22 18:03:34 +01:00
Aidan C. Brady
e778449045
More work! Finished off the upgrade tab and removed upgrade slot from all upgrade-wielding containers.
2014-07-21 18:07:15 -04:00
Aidan C. Brady
69a411813e
Started work on a Digital Miner visual render thing. For some reason it's culling all oceans.
2014-07-21 01:10:53 -04:00
Aidan C. Brady
7e525e10c6
Fixed a few recipes, also started work on Digital Miner visual
2014-07-20 23:29:35 -04:00
Aidan C. Brady
9469fcb51a
Started work on actual flame implementation
2014-07-17 20:06:51 -04:00
Aidan C. Brady
be7ea115b6
Some work on flamethrower sounds, also refactored sound system to allow for multiple sounds from a single object reference (to allow flamethrower and jetpack sounds to work simultaneously)
2014-07-16 16:59:45 -04:00
Ben Spiers
bdde617489
More work on Fusion Reactor
2014-07-16 02:54:13 +01:00
Aidan C. Brady
9abc111ecd
Baby Skeletons, started work on Flamethrower
2014-07-12 22:34:58 -04:00
Aidan C. Brady
df31833cb6
Tiny cleanup
2014-07-08 14:13:29 -04:00
Ben Spiers
4e32a77ac8
Fix Client/Server issues.
2014-07-07 23:33:48 +01:00
Ben Spiers
df58560729
Clean up configs a lot; Fix Config GUIs. This will require people to sort out their configs on their own, as things have moved.
2014-07-07 21:23:04 +01:00
Ben Spiers
4d0f276e55
Fix a server crash relating to a client-side only class initialization (credit to @kosakriszi). Closes #1442 .
2014-06-27 03:25:47 +01:00
Ben Spiers
ff1b3b792e
Config GUIs are cool.
2014-06-27 03:22:46 +01:00
Aidan C. Brady
90da466ca1
Started work on Fluidic Plenisher
2014-06-19 12:42:59 +02:00
Aidan C. Brady
a3784d1fe7
More portable tank work, mainly on GUIs
2014-06-18 21:05:32 +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
fd74ee5c92
Started work on Portable Tank
2014-06-18 03:01:23 +02:00
Aidan C. Brady
0528f1aace
Fix NEI offset for PRC, gave PRC a model, added specific sides for machines
2014-06-17 01:52:59 +02:00
Aidan C. Brady
5fd89a7959
Added recipe for PRC, energy type is now controlled by server ( closes #1369 )
2014-06-16 02:09:31 +02:00
Aidan C. Brady
75f09adba2
Seismic Vibrator model
2014-06-16 01:50:40 +02:00
Aidan C. Brady
49c7b1062a
Improved gas handling, fixed ignoring "NONE" connection. Also got common-side tick handlers up and running again
2014-06-10 12:49:49 +02:00
Aidan C. Brady
f0d3848f8a
Sounds work! Also got tick handlers set up, still have to do a few things
2014-06-03 20:57:59 +02:00
Aidan C. Brady
815944c49a
A major load of fixes - things should be about back to normal now.
2014-06-03 19:54:45 +02:00