Commit Graph
72 Commits
Author SHA1 Message Date
Aidan C. Brady 50f7df5f98 Merge branch 'development' into v8
Conflicts:
	build.properties
	src/main/java/mekanism/api/gas/GasNetwork.java
	src/main/java/mekanism/api/transmitters/DynamicNetwork.java
	src/main/java/mekanism/client/ClientTickHandler.java
	src/main/java/mekanism/common/EnergyNetwork.java
	src/main/java/mekanism/common/FluidNetwork.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/recipe/RecipeHandler.java
	src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/block/BlockGenerator.java
2015-02-10 18:39:15 -05:00
Ben Spiers b5f3d77b83 Making a start on Gas Centrifuge. 2014-12-19 02:23:42 +00:00
Ben Spiers 5b4f154040 Giant optimise imports. 2014-11-10 21:53:29 +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 f0b7f342b8 ElectricBlocks now output to IC2 properly. 2014-10-02 18:54:30 +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 355209d2e3 Fix laser hardness crash 2014-09-14 22:44: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 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 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 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 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
Aidan Brady 81d3d53d76 Merge branch 'development' into 1.8
Conflicts:
	src/main/java/mekanism/client/ClientTickHandler.java
	src/main/java/mekanism/common/item/ItemConfigurator.java
	src/main/java/mekanism/common/tile/TileEntityElectricPump.java
	src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java
2014-08-07 12:29:43 -04:00
Ben Spiers 799f49d9b6 Move to Forge block rotation implementation.
Hopefully the configurator should rotate more stuff now and more wrenches should be able to rotate our blocks
2014-08-07 17:17:22 +01:00
Aidan C. Brady 69874de9d2 Merge branch 'development' into 1.8
Conflicts:
	src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java
	src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
2014-08-05 17:06:29 -04:00
Ben Spiers 2d3dda245a Get all registered fluids to show up in Portable tanks in NEI. 2014-08-04 01:08:49 +01:00
jstockwin 79ce886df2 Fixed some Electric Chest bugs
Electric Chest was not updating when it was (un)locked, meaning that
mechanical pipes would not (dis)connect and reconnect.

Also noticed that Electric Chest won't accept transporters connecting to
the bottom, which I thought was odd, however it looked intentional so I
left it alone. (..?)

Also made it so electric chests will not open if there is a solid block
above them.
2014-08-03 01:00:16 +01:00
Aidan Brady 4090fcf490 Reactor now auto-forms 2014-08-01 00:55:24 -04: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 ce5bddbdd1 Merge branch 'development' into 1.8
Conflicts:
	src/main/java/mekanism/common/block/BlockMachine.java
	src/main/java/mekanism/common/item/ItemBlockMachine.java
	src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
	src/main/java/mekanism/common/tile/TileEntityPRC.java
2014-07-26 18:57:18 -04:00
Aidan C. Brady ab34edc46a Finished off new system of sustained data 2014-07-26 18:44:24 -04:00
Aidan C. Brady 94c3a6aa60 Started work on a new system of managing sustained data 2014-07-26 18:16:00 -04:00
Aidan C. Brady 7ac7fbc5cc Sustained gas and fluid support for Chemical Washer, Chemical Crystallizer and Chemical Infuser 2014-07-26 17:59:43 -04:00
Aidan C. Brady ba289ced25 Added sustained fluid and gas tanks to PRC and Electrolytic Separator, fixed Gas Generator losing energy when being picked up 2014-07-26 17:37:25 -04: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
Aidan C. Brady 52efdac614 Eliminated the deprecated "getSpeedMultiplier()" and "getEnergyMultiplier()" methods 2014-07-23 10:17:03 -04:00
Aidan C. Brady 076c5f7377 More work! 2014-07-21 21:21:53 -04:00
Aidan C. Brady fe177d20c7 Filter-based replacing works! Now to get the require system to work and the warning system set up. 2014-07-20 16:06:47 -04:00
Aidan C. Brady 7ddb8e9727 Merge branch 'development' into 1.8
Conflicts:
	src/main/java/mekanism/client/ClientTickHandler.java
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/Mekanism.java
2014-07-16 23:59:07 -04:00
Aidan C. Brady cfeb08a8ee Fixed Gas Mask OP-ness, added config option to let creative mode override the Electric Chest, fixed Gas Generator crash 2014-07-16 23:53:00 -04:00
Ben Spiers bdde617489 More work on Fusion Reactor 2014-07-16 02:54:13 +01:00
Ben Spiers cb2188580e More Laser and Reactor work. Lasers work now, and Heat Generators generate energy from incident lasers, in order to test lasers. This is probably only temporary. 2014-07-16 02:54:13 +01:00
Ben Spiers 0638cdb61c More work on Fusion Reactor and Lasers 2014-07-13 02:46:47 +01:00
Aidan C. Brady ee00c5a22b Chemical Dissolution Chamber now can accept upgrades 2014-07-11 00:42:06 -04:00
Aidan C. Brady 65a8633441 Gave Chemical Oxidizer and PRC upgrade systems, fixed Chemical Oxidizer and Electrolytic Separator NEI modules 2014-07-10 22:28:04 -04:00
Aidan C. Brady f67be01658 Tank-based fluid container interaction fixes. Can't figure out the data request issue. 2014-07-07 15:54:26 -04:00