Commit Graph
110 Commits
Author SHA1 Message Date
Ben Spiers b5f3d77b83 Making a start on Gas Centrifuge. 2014-12-19 02:23:42 +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 3c715d906b Shuffle up EnergyNet support a bit.
Remove the ENet's TileEntity instead of the world's one, and remove the existing one if one exists when adding the current one. Also move registration to on first tick to hopefully avoid adding too early issues. This is when IC2's delegates register so should be relatively foolproof.
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityElectricBlock.java
2014-10-02 18:54:30 +01:00
Ben Spiers 5d08726880 Add config options to blacklist the different power systems.
This should help people avoid IC2 problems with console spam, but such a "solution" only relieves the most obvious symptom of chunk-thrashing, it doesn't stop the thrashing itself.
2014-09-30 20:40:18 +01:00
Porter Westling 986e0ac1b4 add config for salination plant water transformation per update 2014-09-24 09:31:47 -07: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 c7a429177b More work in the quest for greater recipe efficiency. 2014-09-05 04:20:12 +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 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 a01cf948ff Add recipe and ItemBlock to plastic barriers. 2014-09-02 20:29:09 +01:00
Ben Spiers 2a52ba36af Make SoundHandler static, remove some unneeded stuff. 2014-08-30 01:51:42 +01:00
Ben Spiers 96072e0f5e Merge branch 'development' into 1.8 2014-08-27 02:19:42 +01:00
Aidan C. Brady 6714034771 Fixed RedstoneArsenal dependency 2014-08-24 16:32:20 -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 275c7840cc Reorganized package structure to separate content from base code 2014-08-20 15:22:55 -04:00
Aidan C. Brady 833e0dc385 Began base implementation of the Energized Induction Matrix 2014-08-19 12:40:57 -04:00
Aidan C. Brady aa2c79672b Began the actual implementation of PathfinderCache 2014-08-17 21:36:16 -04: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
Aidan C. Brady 98ee002472 Merge back the network fixes 2014-08-09 13:43:59 -04:00
Aidan C. Brady e032eb0370 Fixed the network CME (badly), also added "dustWood" as an OreDict entry for Sawdust 2014-08-09 13:42:13 -04: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 C. Brady 76d2997a6b A quick fix 2014-08-08 15:09:42 -04:00
Aidan C. Brady 9566e25ba6 Merge branch 'development' into 1.8
Conflicts:
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/util/CableUtils.java
2014-08-08 14:46:37 -04:00
Ben Spiers cf18bc45a2 Remove unnecessary entity registrations - registerModEntity does it for us. Pray to any and all applicable supernatural entities that this solves the (EntityLivingBase)EntityBalloon crash 2014-08-08 18:25:47 +01:00
Aidan C. Brady c04fdd4432 Started work on PathfinderCache - this will store paths that have been already calculated for later use. When a path becomes possibly invalidated, it is removed from the cache. 2014-08-08 00:13:17 -04:00
Aidan C. Brady d5508667f3 Merge branch 'development' into 1.8
Conflicts:
	src/main/java/mekanism/common/item/ItemBlockEnergyCube.java
	src/main/java/mekanism/common/multipart/PartTransmitter.java
	src/main/java/mekanism/common/tile/TileEntityBasicMachine.java
	src/main/java/mekanism/common/tile/TileEntityBin.java
	src/main/java/mekanism/common/tile/TileEntityChargepad.java
	src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java
	src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java
	src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java
	src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java
	src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java
	src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
	src/main/java/mekanism/common/tile/TileEntityFactory.java
	src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java
	src/main/java/mekanism/common/tile/TileEntityPortableTank.java
	src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java
	src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java
	src/main/java/mekanism/common/tile/TileEntityTeleporter.java
	src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
2014-08-07 23:02:11 -04:00
Aidan C. Brady 7634c29df9 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-08-07 21:33:23 -04:00
Aidan C. Brady 1fd5e498e8 Major packet improvements - trying to get on the good side of server owners. More to come.
Instead of sending to all players in a dimension or within a defined range, packets will now only be sent to players who have the chunk loaded that the packet is being sent from on the server.
2014-08-07 21:33:17 -04: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
Aidan Brady 008afaf359 Merge branch 'master' into development 2014-08-07 12:21:11 -04:00
Ben Spiers 2ba639f8fc Fix running with Forestry but not BC. 2014-08-07 03:58:01 +01:00
Aidan Brady 78c0cc4c7c Fixed an issue where networks would be forgotten, made shift-M turn jetpack off immediately, simplified network code a bit 2014-08-06 18:25:33 -04:00
Aidan Brady 20dc1ae28a Bump version to 7.1.0. 2014-08-06 12:51:48 -04: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
Aidan Brady 19cfb7b8d6 Generalized the actual manager, and the data manager (by means of reflection) 2014-08-02 00:10:29 -04:00
Aidan Brady fc7dd3e65a Started on a new, more modular approach to controller-less multiblocks, allowing for the creation of the EIM 2014-08-01 13:04:31 -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
Aidan Brady ed4aa7671c Merge branch 'development' into 1.8
Conflicts:
	src/main/java/mekanism/common/EnergyNetwork.java
2014-07-31 19:00:54 -04:00
Aidan Brady b2e676aabb Fixed an API issue, fixed Robit nametag not updating, fixed Sorter Mod ID filter bugginess 2014-07-31 18:41:27 -04:00
Ben Spiers 26bc15ac3b Adding Lit Redstone Ore to OreDict is well and truly broken. 2014-07-31 15:53:24 +01:00
Aidan Brady 1ad7fe81b9 Salination Plant now auto-forms 2014-07-28 09:27:08 -04:00
Aidan C. Brady 5bee3991d8 Merge branch 'development' into 1.8
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
2014-07-23 13:50:43 -04:00
Aidan C. Brady 2b5bb53bc6 Fixed a few recipe issues 2014-07-23 13:43:12 -04:00
Aidan C. Brady 076c5f7377 More work! 2014-07-21 21:21:53 -04:00
Aidan C. Brady 0864e1061a Merge a few more fixes 2014-07-21 16:45:08 -04:00
Aidan C. Brady 27056da3e4 Merge back a few bug fixes 2014-07-21 16:41:27 -04:00