Commit Graph
67 Commits
Author SHA1 Message Date
Aidan C. Brady e4d624d8ab Fancy new eject algorithms, should fix issues with PRC 2015-03-30 19:27:54 -04:00
Aidan C. Brady b4c2664c5e Work a bit on a new, dynamic ejector system 2015-03-30 08:39:37 -04:00
Aidan C. Brady 7afef3f8ee Fixed an API issue, implemented new default icon system to allow for dynamic factory icons based on recipe type 2015-03-26 17:10:32 -04:00
Aidan C. Brady 2d727b56ca Fixed some naming - factories now display their complete names 2015-03-26 10:17:06 -04:00
Aidan C. Brady d88f8a4606 Fixed upgrades not maintaining machine dataa 2015-03-25 23:51:46 -04:00
Aidan C. Brady 0e51852baa Cleanup, fixed a transporter bug 2015-03-24 18:33:13 -04:00
Ben Spiers 0064f09d8c Backwards-compatibility for IGasHandler. #2267 2015-03-22 14:36:21 +00:00
Aidan C. Brady f8f1467304 Cleanup 2015-03-21 17:23:36 -05:00
Ben Spiers c323969c87 Recalcuation things. 2015-03-21 19:44:17 +00:00
Ben Spiers 83e41478e5 Localisation, icon, fixes. 2015-03-21 19:13:15 +00:00
Ben Spiers 2e8edb281c Gas Upgrades. 2015-03-21 19:13:04 +00:00
Ben Spiers 0658e04880 Fix upgrade dupe with factories. 2015-03-21 19:12:55 +00:00
Ben Spiers 9936c05da7 Recipe and upgrade fixes. 2015-03-21 19:11:56 +00:00
Aidan C. Brady c3ef938166 Implemented the SoundWrapper system again - for some reason dedicated servers won't behave without it on OS X 2015-03-19 23:16:27 -04:00
Ben Spiers a90680eaae Fix sounds on the client-side of factories 2015-03-19 00:16:36 +00:00
Ben Spiers 0307acc7eb Fix sounds on the server side. 2015-03-18 20:52:58 +00:00
Aidan C. Brady 339e048a4e After much client code isolation, there should be no more issues on the server side with sounds 2015-03-18 13:26:12 -04:00
Halvor Lyche Strandvoll 97e51e0c26 Cleanup, cleared some warnings. 2015-03-18 13:51:14 +01:00
Aidan C. Brady e3ca5ccecd Implemented the new systems in factories and chemical crystallizers, added better configurator mode switch tooltips 2015-03-08 18:55:56 -05:00
Aidan C. Brady 8ce105d95f More configuration work 2015-03-08 13:27:34 -05:00
Aidan C. Brady 1f59f8ca1d Finished implementation of sided energy configuration. Yay! 2015-03-08 00:59:39 -06:00
Aidan C. Brady e70650154d Added energy config readiness to all configurable machines, still yet to actually implement energy management 2015-03-07 23:55:22 -06:00
Aidan C. Brady d4d7e88c4e Developed and implemented the foundation for Item/Gas/Energy/Fluid/Heat dynamic side configuration.
As of now, only items are supported, and the actual config GUI has not been changed. Only gameplay difference is three new configurator modes.
2015-03-07 19:09:23 -05:00
Aidan C. Brady 55ed9cd1f1 Fixed machines not saving state after being installed 2015-03-05 14:43:29 -05:00
Aidan C. Brady abd581b2f1 Factory Installers are done! 2015-03-05 08:24:00 -05:00
Aidan C. Brady 274930fd8a Initial work complete for factory installers! Still need to add recipes and algorithm to transform generic machines into basic factories 2015-03-05 01:11:51 -05:00
Aidan C. Brady ce31b1e22c Start work on the Energized Induction Matrix. This is going to be fun! 2015-02-28 13:08:17 -06:00
Aidan C. Brady bf4b74f535 A few fixes 2015-02-19 17:17:28 -05:00
Aidan C. Brady 2fe4cf290d Merge branch 'master' into development (@unpairedbracket, make sure I did this right)
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
	src/main/java/mekanism/common/util/MekanismUtils.java
2015-02-19 16:12:28 -05:00
Aidan C. Brady 25df777b84 Work on fusion fuel creation mechanics, allowed Chemical Washer to accept upgrades 2015-02-17 21:27:35 -05:00
Ben Spiers 49be30de34 Merge branch 'development' into v8
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
	src/main/java/mekanism/common/tile/TileEntityFactory.java
	src/main/java/mekanism/common/util/MekanismUtils.java
2014-12-14 19:04:03 +00:00
Ben Spiers a91dcc49d4 Introduce statistical consumption of gases. 2014-12-14 18:10:46 +00:00
Ben Spiers 2507bd3ecb Fix some merge dodginess. 2014-11-13 22:18:26 +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 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 e84f176583 Add pulse mode to redstone control.
(I am going somewhere with this)
2014-09-16 02:47:54 +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 3c547fa0aa Fix factories and smelting. 2014-09-05 18:31:10 +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 2a52ba36af Make SoundHandler static, remove some unneeded stuff. 2014-08-30 01:51:42 +01:00
Ben Spiers 896c943758 Cleaning up unused stuff and 3-space tabs (?) 2014-08-27 23:55:35 +01:00
Ben Spiers da6cbeb46d More big sound work 2014-08-27 23:16:59 +01:00
Ben Spiers 96072e0f5e Merge branch 'development' into 1.8 2014-08-27 02:19:42 +01:00
Ben Spiers 40c06f1004 Fix secondary energy consumption with speed upgrades.
Might make them less efficient with speed upgrades and add a secondary
energy upgrade that mitigates this, like the current energy upgrade.
2014-08-27 02:17:45 +01:00
Ben Spiers de880c5ab0 Make Pressurized Tubes able to pull from IGasHandlers. Hopefully I didn't screw anything up too badly. 2014-08-10 03:34:01 +01:00
Aidan Brady 1d6de974d3 A bit of package reorganization, added InventoryNetwork to transporters 2014-08-09 22:20:49 -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 12ad58b1f9 Turns out I was sending a ton of packets to the entire player list on the server when it wasn't actually necessary at all, switched to new sendToReceivers() method 2014-08-07 22:48:35 -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