Commit Graph
46 Commits
Author SHA1 Message Date
aidancbrady 0a135a6936 Loads of changes to Electric Pump, Fluidic Plenisher and Transmitters
- Electric Pumps are now more efficient, upgradable, and have new config options, one of which prevents sucking of water sources (true by default)
- Fluidic Plenishers are now upgradable
- Transmitters can be upgraded by being right-clicked by alloys normally involved in crafting-based upgrading
2016-01-28 20:38:32 -05:00
aidancbrady 3f158d26da Fixed cable crash 2016-01-13 17:00:25 -05:00
aidancbrady 2b785c95f3 Transmitters now intelligently maintain buffers when transmitter nodes are destroyed 2015-11-26 15:41:22 -07:00
Ben Spiers d3c9e73aa7 Possible fix for EnergyNet weirdness. 2015-04-11 14:28:05 +01:00
Ben Spiers 91d323ccdd Maybe fix negative buffer issues . 2015-04-10 23:55:59 +01:00
Ben Spiers 4a2dde8f87 Fix API, put back some methods that GC uses, optimise imports in API. 2015-04-06 18:53:16 +01:00
Aidan C. Brady 034d732e15 A bit more tidying 2015-04-06 11:10:57 -04:00
Ben Spiers 7a2461540f Merge branch 'development' into networkRefactor.
Hopefully I didn't miss anything

Conflicts:
	src/main/java/mekanism/api/gas/GasNetwork.java
	src/main/java/mekanism/client/render/RenderPartTransmitter.java
	src/main/java/mekanism/common/EnergyNetwork.java
	src/main/java/mekanism/common/FluidNetwork.java
	src/main/java/mekanism/common/InventoryNetwork.java
	src/main/java/mekanism/common/content/transporter/TransporterStack.java
	src/main/java/mekanism/common/multipart/PartHeatTransmitter.java
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
	src/main/java/mekanism/common/multipart/PartMechanicalPipe.java
	src/main/java/mekanism/common/multipart/PartPressurizedTube.java
	src/main/java/mekanism/common/multipart/PartSidedPipe.java
	src/main/java/mekanism/common/multipart/PartUniversalCable.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/common/util/PipeUtils.java
2015-04-03 19:45:25 +01:00
Ben Spiers d14686ea2e Work on clientsiding, acceptors and things like redstone and multipart blocking. 2015-04-02 03:22:53 +01:00
Ben Spiers 47b4eb28b4 Start on refactor of entire network system.
It will hopefully make networks more robust and efficient, using lessons learned since last time I rewrote large parts of it.
We can hopefully avoid Concurrent Modification issues this way, and it should be more forgiving on chunk loads as well.
Transmitter stuff is working well, next acceptors and client rendering need tobe brought in.
2015-04-01 02:42:36 +01:00
Aidan C. Brady fe8cc9d1e0 Tiered Pressurized Tubes, better tooltips, better transmitter icons 2015-03-31 17:46:09 -04:00
Aidan C. Brady 413fac32fa Logistical Transporters now render color in glass instead of frame 2015-03-31 08:47:40 -04:00
Aidan C. Brady f350055fab Universal Cables can now draw energy from laser amplifiers 2015-03-29 18:29:34 -04:00
Aidan C. Brady f83d481fd6 Rewrote multiblock data saving, changed simple side names 2015-03-25 21:49:07 -04:00
Aidan C. Brady 5513859216 Cleanup, updated IC2 API 2015-03-23 20:34:43 -04:00
Ben Spiers 71a9bfc4f9 Make the @Optional removals stricter.
Require IC2, BC or CoFHCore to be loaded in order to use their respective APIs. Remove all the individual mod deps to prevent us depending on mods that depend on us.
2015-03-16 15:48:19 +00:00
Aidan C. Brady 03f6156d23 Minor cleanup 2015-02-16 17:20:51 -05:00
Ben Spiers 5dc0e5dca1 Merge branch 'development' into v8 2014-12-18 23:01:31 +00:00
Ben Spiers fd0bdd4da8 Efficiency of isValidAcceptor methods. 2014-12-18 22:52:45 +00:00
Ben Spiers 2507bd3ecb Fix some merge dodginess. 2014-11-13 22:18:26 +00:00
Ben Spiers ece8c6eb08 Only receive RF from sides in NORMAL mode.
Conflicts:
	src/main/java/mekanism/common/multipart/PartUniversalCable.java
2014-11-13 19:45:58 +00:00
Ben Spiers 224d778155 Make PULL mode actually, and exclusively, pull.
Conflicts:
	src/main/java/mekanism/common/multipart/PartUniversalCable.java
2014-11-13 19:43:05 +00:00
Ben Spiers b31aa92844 Update lots of APIs, most notably BC and an actual 1.7 version of CC
Conflicts:
	build.properties
	src/api/java/buildcraft/api/core/BlockIndex.java
	src/api/java/buildcraft/api/core/BuildCraftAPI.java
	src/api/java/buildcraft/api/fuels/IFuel.java
	src/api/java/buildcraft/api/mj/BatteryObject.java
	src/api/java/buildcraft/api/mj/IBatteryIOObject.java
	src/api/java/buildcraft/api/mj/IBatteryObject.java
	src/api/java/buildcraft/api/mj/IOMode.java
	src/api/java/buildcraft/api/mj/MjAPI.java
	src/api/java/buildcraft/api/mj/MjBattery.java
	src/api/java/buildcraft/api/power/PowerHandler.java
	src/api/java/buildcraft/api/recipes/CraftingResult.java
	src/api/java/buildcraft/api/recipes/IAssemblyRecipeManager.java
	src/api/java/buildcraft/api/recipes/IFlexibleRecipe.java
	src/api/java/buildcraft/api/recipes/IRefineryRecipeManager.java
	src/api/java/buildcraft/api/transport/IPipe.java
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/EnergyNetwork.java
	src/main/java/mekanism/common/FuelHandler.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java
	src/main/java/mekanism/common/multipart/MultipartMekanism.java
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
	src/main/java/mekanism/common/multipart/PartUniversalCable.java
	src/main/java/mekanism/common/network/PacketConfigSync.java
	src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java
	src/main/java/mekanism/common/tile/TileEntityElectricBlock.java
	src/main/java/mekanism/common/util/CableUtils.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/common/util/TransporterUtils.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
2014-11-13 19:30:39 +00:00
Ben Spiers 0d21d201a9 Only receive RF from sides in NORMAL mode. 2014-11-11 12:25:58 +00:00
Ben Spiers 92f1579bba Make PULL mode actually, and exclusively, pull. 2014-11-11 12:25:10 +00:00
Ben Spiers 4d1c1285b2 Update lots of APIs, most notably BC and an actual 1.7 version of CC 2014-11-10 21:51:37 +00: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
Aidan C. Brady ec1c02d2e5 Cleanup 2014-08-25 09:00:01 -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 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 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 faad9762df Merge branch 'development' into 1.8
Conflicts:
	build.properties
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/tile/TileEntityBin.java
	src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
	src/main/java/mekanism/tools/common/MekanismTools.java
2014-08-06 12:56:37 -04:00
Aidan Brady 1896a42afa Cleaned up that fix 2014-08-05 22:31:57 -04:00
Ben Spiers a865a19340 Implement canConnectEnergy so RF cables don't connect when they shouldn't 2014-08-06 02:51:25 +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
Aidan C. Brady ee87d8cef5 Transmitter code cleanup - killed the now-unused merge() method and separated data handlers from ITransmitterNetwork itself. Also added new pipe textures. 2014-07-09 15:31:57 -04:00
Ben Spiers ac223c8df5 Fix ic2 pulling and IConfigurable passthrough (leaving the OreDict fix for the Pull Request). getConnectedOutputters was broken. 2014-06-26 23:47:33 +01:00
Ben Spiers 8ddda5d0dc BuildCraft now also working without shipping API 2014-06-26 19:28:40 +01:00
Ben Spiers 611d4c8f52 Got some IC2 stuff working now. Turns out I was being stupid. 2014-06-26 18:18:18 +01:00
Ben Spiers 9c58ed549f Start of work on Doing It Right™. Appears to work for cofh's API, not yet for IC2 or BC. Not sure why. Might have to ask @cpw. 2014-06-26 01:10:53 +01:00
Aidan C. Brady 90c1c690a9 Updated Cofh API 2014-06-15 13:35:51 +02:00
Aidan C. Brady 3a81058cbd Fix more transmitter render issues, also started on PRC NEI module 2014-06-14 19:31:24 +02:00
Aidan C. Brady 4446e14ba3 Sound system work 2014-06-02 23:57:40 +02:00
Ben Spiers db7121454a Re-add an updated ic2, alter CC and update DepLoader. Fix more of the things.
1792 errors. A good night's work, I think.
2014-04-20 04:34:19 +01:00
Ben Spiers ab47724473 Move the directory structure around to a more conventional one and start out on the 1.7 update.
3797 errors. We have a long way to go.
2014-04-20 03:44:06 +01:00