tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2871 commits 2 branches 0 tags 102 MiB
Commit graph

929 commits

Author SHA1 Message Date
Ben Spiers
17f9f88b34 Prevent Osmium Compressor and Combiner from using secondary energy upgrades. 
Also make them deterministic again to prevent them getting stuck
 2015-02-19 16:36:16 +00:00
Aidan C. Brady
cb377f88ab Fixed duplicate method 2015-02-19 09:15:56 -05:00
Aidan C. Brady
f67c048e78 Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/common/multipart/PartSidedPipe.java
 2015-02-19 09:15:30 -05:00
Aidan C. Brady
c59b64f7c9 Merged changes 2015-02-19 09:15:00 -05:00
Aidan C. Brady
0819c0ad5f Hopefully fixed the transmitter network halt issue. Provide feedback! 2015-02-19 09:13:03 -05:00
Aidan C. Brady
f7f4bd7243 Fixed Heat Generator burn time 2015-02-19 09:00:20 -05:00
Aidan C. Brady
b419519cc0 Chemical Infuser, Chemical Washer and Electrolytic Separator are now upgradeable 2015-02-18 19:33:03 -05:00
Brian Lewis
e842556c5b [#2069] Fix for modded items being added to cardboardbox blacklist 2015-02-18 17:30:09 -06:00
Brian Lewis
d41fec6031 Fix for setting generator output when ethylene already in tank when placed 2015-02-18 17:25:16 -06:00
Aidan C. Brady
f320aa4337 Merge branch 'master' into development 2015-02-17 21:35:01 -05:00
Aidan C. Brady
dcf7d7772a Fixed a transporter output bug 2015-02-17 21:34:36 -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
Aidan C. Brady
cb2e38ec61 Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityBasicBlock.java
 2015-02-16 18:13:03 -05:00
Aidan C. Brady
488af7e8ae Fixed facing updates not being sent out by machines 2015-02-16 18:12:31 -05:00
Aidan C. Brady
d33af99b87 More cleanup 2015-02-16 18:11:45 -05:00
Aidan C. Brady
548145ae02 Revert "Revert "Fix some transmitter issues."" 
This reverts commit e9ef6c1866.
 2015-02-16 17:24:51 -05:00
Aidan C. Brady
e9ef6c1866 Revert "Fix some transmitter issues." 
This reverts commit f63807c75a.
 2015-02-16 17:21:39 -05:00
Aidan C. Brady
03f6156d23 Minor cleanup 2015-02-16 17:20:51 -05:00
Aidan C. Brady
3561f9fe59 Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
	src/main/java/mekanism/tools/common/MekanismTools.java
 2015-02-16 14:40:10 -05:00
Aidan
b885742690 Merge pull request #2001 from Dannerick/master 
Fix for #1997 gasGenerators incorrectly limiting output
 2015-02-16 14:32:52 -05:00
Ben Spiers
0cef749249 Actually increment the Mod classes' versions 2015-02-13 14:40:14 +00:00
Christian Ehrhardt
db4adce2a8 Shift-click items to top (fill) slot 2015-02-12 19:18:16 -06:00
Aidan C. Brady
2796a5d67b Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/api/transmitters/DynamicNetwork.java
	src/main/java/mekanism/client/ClientTickHandler.java
 2015-02-12 13:10:55 -05:00
Ben Spiers
7e08643ebd ConcurrentHashMaps don't like null keys 2015-02-12 16:59:39 +00:00
Ben Spiers
122f4190bd Remove some bad/unneeded imports 2015-02-12 16:42:25 +00:00
Ben Spiers
e6a4d3efb2 Screw it, let's just make these concurrent. 
Keeping transmitters as a synchronizedSet-wrapped LinkedHashSet for now, because there isn't a ConcurrentLinkedHashSet.
 2015-02-12 16:39:48 +00:00
Aidan C. Brady
0612712abe Fixed energy cubes not outputting items 2015-02-11 08:43:32 -05:00
Aidan C. Brady
81c948f28d Fixed capes 2015-02-11 08:36:52 -05:00
Aidan C. Brady
086dd83a57 Fixed capes 2015-02-11 08:36:40 -05:00
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
Aidan C. Brady
d8e12ca8d2 Merge branch 'development' into v8 
Conflicts:
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
	src/main/java/mekanism/generators/common/block/BlockGenerator.java
 2015-02-10 11:38:13 -05:00
Ben Spiers
3e38ac37f4 This feature request has been more trouble than it's worth. 2015-01-19 12:16:04 +00:00
Ben Spiers
2ced2e3860 Fix the bad implementation of the ambient lighting toggle 2015-01-19 12:07:54 +00:00
Ben Spiers
1f9185dd01 Make the gas mask and jetpack maps synchronized 2015-01-10 18:17:17 +00:00
Ben Spiers
89be8b4482 Fix using localised names for overlay textures. 2015-01-10 17:47:16 +00:00
Ben Spiers
b8b49db104 It seems the Heat Transfer equations I'm using are a bit stiff. 
Adjust some paramaters some to improve how well we deal with this.
 2015-01-09 02:50:18 +00:00
Ben Spiers
385a1d29f6 Make a start on the boiler. 
It's currently causing odd issues with the heat simulator and has various issues such as balance not existing yet.
Also improve the specification of a load of the multiblock generics to reduce needless casting.
 2015-01-08 05:26:53 +00:00
Ben Spiers
c0db6b7eb5 Fix #2075, hopefully. 2015-01-07 23:58:23 +00:00
Ben Spiers
41cf1a2437 Move a bunch of registrations to PreInit. 
I believe they should be happening there in the first place.
 2015-01-07 23:13:45 +00:00
Ben Spiers
4b75a2f6a2 Hopefully improve the synchronization of the networks' transmitter sets 2015-01-07 23:13:10 +00:00
Ben Spiers
fdde129180 Obfuscate password entry 2014-12-28 23:01:26 +00:00
Ben Spiers
3d4636d8da Config option for generator lighting 2014-12-27 21:37:20 +00:00
Ben Spiers
f419c4e6d5 Fix anvil and snow pickup 2014-12-27 21:26:20 +00:00
Ben Spiers
aea27f3bd6 Merge pull request #2029 from SoraZodia/master 
@Interface removal for IPipeTile
 2014-12-27 21:17:42 +00:00
Ben Spiers
f63807c75a Fix some transmitter issues. 2014-12-27 21:09:34 +00:00
Ben Spiers
ccf7a37b22 Make HeatUtils not take unnecessary arguments. 2014-12-27 21:08:18 +00:00
Ben Spiers
d4f48401d3 Merge branch 'development' into v8 2014-12-22 23:46:17 +00:00
Ben Spiers
c77e84ca6c Make cyan brighter 2014-12-22 23:41:33 +00:00
Ben Spiers
fe2c22862a Fill in some machines' type arguments. 2014-12-22 23:40:51 +00:00
Ben Spiers
00fa5ccbe6 Make the heat methods not crash. 2014-12-22 23:40:29 +00:00
Ben Spiers
37e35d5943 Make loading the reactor from file update the "last" temperatures. 2014-12-22 23:40:03 +00:00
Ben Spiers
f3d9faff6b Make it dangerous to be in the reactor while it is at >100million degrees, and full of burning plasma. 2014-12-22 23:38:32 +00:00
Ben Spiers
bc1ef33cd6 Make unforming the fusion reactor stop the burn. 2014-12-22 23:36:37 +00:00
Ben Spiers
7296c3dbcb Reactors now a Heat source. Awaiting Balance. 2014-12-22 21:30:45 +00:00
Ben Spiers
3544addf20 Make heat generator not lose energy when below ambient temperature, and use the Carnot Engine equations for efficiency. 2014-12-22 20:10:01 +00:00
Ben Spiers
8a4aaff44a Move standard simulation method into a Utils class. 2014-12-22 19:38:03 +00:00
Ben Spiers
ab2a7cb6c7 Improve temperature colours to allow for different base colours. 
Make a start on insulation.
Code the characteristics of air into static IHeatTransfer variables.
 2014-12-22 19:14:55 +00:00
Ben Spiers
7214a88a7a Make network reader not use energy when in creative mode. 2014-12-20 02:09:55 +00:00
Ben Spiers
4a404dfc78 Improve Heat mechanic, and get it rendering nicely. 
Colour temperature algorithm adapted from http://www.tannerhelland.com/4435/convert-temperature-rgb-algorithm-code/ - thanks to Tanner Hellan for the useful post.
 2014-12-20 02:09:14 +00:00
Ben Spiers
2bd2e94c7b Heat Generator changed to use the new heat mechanic. Not balanced or anything yet, more a proof of concept. 2014-12-19 04:49:15 +00:00
Ben Spiers
bb937fdd53 Heat Transmission. 2014-12-19 04:46:23 +00:00
Ben Spiers
b5f3d77b83 Making a start on Gas Centrifuge. 2014-12-19 02:23:42 +00:00
Ben Spiers
5dc0e5dca1 Merge branch 'development' into v8 2014-12-18 23:01:31 +00:00
Ben Spiers
6aa84d1388 Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityPortableTank.java
 2014-12-18 22:56:26 +00:00
Ben Spiers
1ce56d09e2 Fix Portable Tank NPE 2014-12-18 22:53:24 +00:00
Ben Spiers
fd0bdd4da8 Efficiency of isValidAcceptor methods. 2014-12-18 22:52:45 +00:00
Brian Lewis
b95836e6be Merge remote-tracking branch 'upstream/master' 2014-12-18 08:50:53 -06:00
Ben Spiers
b5e289b504 Merge branch 'development' into v8 2014-12-16 20:35:55 +00:00
Ben Spiers
6e422151be Merge branch 'master' into development 2014-12-16 20:34:55 +00:00
Ben Spiers
9a6b3c511e Fix a silly mistake 2014-12-16 20:33:23 +00:00
Ben Spiers
d181dd9fd6 Oops. 2014-12-16 01:16:09 +00:00
Ben Spiers
40590f7a33 Merge branch 'development' into v8 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityElectricPump.java
 2014-12-15 17:34:24 +00:00
Ben Spiers
add14395e4 Merge branch 'master' into development 2014-12-15 17:29:45 +00:00
Ben Spiers
e14501f3b5 Add RedstoneControl to Electric Pump. 2014-12-15 17:28:57 +00:00
Ben Spiers
e51307d68f Fix merge 2014-12-15 17:20:13 +00:00
SoraZodia
14a7383e6a @Interface removal for IPipeTile 
It was causing an NoClassDefFoundError

In case you need proof, here's the crash log:
http://pastebin.com/9unZd9LG
 2014-12-15 00:00:23 -10:00
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
7ebcba8528 Merge branch 'master' into development 2014-12-15 00:03:08 +00:00
Ben Spiers
ee585c05dc Make glowing plastic blocks glow. 2014-12-15 00:02:22 +00: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
a64cd69535 Merge branch 'master' into development 2014-12-14 18:17:36 +00:00
Ben Spiers
a91dcc49d4 Introduce statistical consumption of gases. 2014-12-14 18:10:46 +00:00
Ben Spiers
123ed6c6c5 Merge branch 'master' into development 2014-12-14 01:54:49 +00:00
Ben Spiers
e98026d78d Fix paxels 2014-12-14 01:53:26 +00:00
Brian Lewis
681d7e9963 Removed commented out test line 2014-11-28 12:20:29 -06:00
Brian Lewis
15b6f7e70c Fix for #1997 - gasGenerators now correctly limit output based on fuel type burned 2014-11-28 12:13:34 -06:00
Aidan C. Brady
a94b9a227d Digital Miner delay is now persistent 2014-11-21 08:23:56 -05:00
Aidan C. Brady
db5c2c3d2c Added IToolHammer support 2014-11-21 08:17:47 -05:00
Aidan C. Brady
ec5793dc4d Fixed typo, fixed coloring of fluids in Dynamic Tank, Portable Tank & Mechanical Pipes 2014-11-21 08:13:38 -05:00
Ben Spiers
ce390ae426 Reorganise trait registration 2014-11-17 22:48:46 +00:00
Ben Spiers
0a0f67ee81 Get rid of IPipeTile since it wasn't working anyway. Fixes #1971, #1975 2014-11-17 22:48:46 +00:00
Ben Spiers
791ed60bb0 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/multipart/MultipartMekanism.java
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
 2014-11-17 22:47:08 +00:00
Ben Spiers
5749ed4d2a Merge branch 'master' into development 2014-11-17 22:41:15 +00:00
Ben Spiers
1f2dd3162a Reorganise trait registration 2014-11-17 22:40:38 +00:00
Ben Spiers
1a8e2326b9 Get rid of IPipeTile since it wasn't working anyway. Fixes #1971, #1975 2014-11-17 22:40:18 +00:00
Ben Spiers
19fa918daa Merge branch 'development' into 1.8 2014-11-16 23:59:33 +00:00
Ben Spiers
7ab1e66d6a Merge branch 'master' into development 2014-11-16 23:58:55 +00:00
Ben Spiers
11fac12840 Should fix #1762. 2014-11-16 23:58:12 +00:00
Aidan C. Brady
a699a4b860 Merge branch 'master' into development 2014-11-16 11:45:13 -05:00
Aidan C. Brady
de5cc8c76d Merge fix changes 2014-11-16 11:45:05 -05:00
Aidan C. Brady
e54edcf4cf Another fix attempt 2014-11-16 11:43:08 -05:00
Aidan C. Brady
53b5a25558 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
 2014-11-16 01:08:08 -05:00
Aidan C. Brady
ebb23fbfea Merge branch 'master' into development 2014-11-16 01:06:44 -05:00
Aidan C. Brady
5be57a20d6 Attempt a fix at an API bug 2014-11-16 01:06:00 -05:00
Aidan C. Brady
1b159d3242 Another cleanup 2014-11-16 01:00:41 -05:00
Aidan C. Brady
607eb31316 A few minor cleanups 2014-11-15 18:46:11 -05:00
Ben Spiers
2507bd3ecb Fix some merge dodginess. 2014-11-13 22:18:26 +00:00
Ben Spiers
c5e8c866ce Fix me being stupid. #1943 2014-11-13 19:46:41 +00:00
Ben Spiers
6872279a0e Stop UniCables claiming to carry MJ 2014-11-13 19:46:21 +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
64d0f8a5cc Merge branch 'master' into development 2014-11-11 12:52:27 +00:00
Ben Spiers
3a805bd948 Fix me being stupid. #1943 2014-11-11 12:51:28 +00:00
Ben Spiers
a0c492862f Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/common/multipart/ItemGlowPanel.java
 2014-11-11 12:37:57 +00:00
Ben Spiers
8f6b24ba67 Stop UniCables claiming to carry MJ 2014-11-11 12:27:03 +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
5b4f154040 Giant optimise imports. 2014-11-10 21:53:29 +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
Aidan C. Brady
3abf36ef14 Fixes to config GUI, added new localization 2014-11-07 12:52:45 -05:00
Aidan Brady
0cccaaa415 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/multipart/ItemGlowPanel.java
 2014-10-26 15:28:28 -04:00
Aidan Brady
aa103e28da Minor cleanup 2014-10-26 15:20:52 -04:00
Aidan Brady
c1f5b65cf5 Merge branch 'master' into development 2014-10-26 15:20:10 -04:00
Aidan Brady
1b665d99e2 Fixed a Portable Tank crash 2014-10-26 15:19:00 -04:00
Aidan C. Brady
10107678d1 Fixed strange glow panel issue 2014-10-17 12:03:42 -04: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
Aidan C. Brady
d0a62c564e Merge branch 'master' into development 2014-10-17 11:48:02 -04:00
Tonius
fc83b1b837 Added NEI usage handler for infusion objects 2014-10-05 19:23:53 +02:00
Ben Spiers
92a5929c28 That was not a statement. 2014-10-02 22:16:29 +01:00
Ben Spiers
4f41f5a1df Prevent IC2 double-outputting. 2014-10-02 18:54:30 +01:00
Ben Spiers
f0b7f342b8 ElectricBlocks now output to IC2 properly. 2014-10-02 18:54:30 +01: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
b25d8f673b Only use the EnergyNet-related interfaces if IC2 itself is loaded. 
Also add some extra safety to useIC2().
Conflicts:
	src/main/java/mekanism/common/util/MekanismUtils.java
 2014-10-02 18:54:30 +01:00
Aidan C. Brady
ed8823b038 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/Mekanism.java
 2014-10-02 12:47:22 -04:00
Aidan C. Brady
65ea389118 Merge branch 'master' into development 2014-10-02 11:22:31 -04:00
Aidan
26dadfe176 Merge pull request #1876 from sk89q/oredictcache-fix 
Fix some performance issues with OreDictCache
 2014-10-02 11:16:47 -04:00
TheJulianJES
ea42e52973 Fix > 3D Bow Bug 2014-10-01 17:30:32 +02:00
sk89q
16fc882da7 Change OreDictCache to hit the hash map one fewer time. 2014-09-30 13:26:34 -07:00
sk89q
125ac34c01 Use object default hashCode in ItemInfo for Item. 
Also change the hashCode() algorithm slightly.
 2014-09-30 13:24:00 -07:00
sk89q
3f6c87d8f5 Fix ItemInfo.equals() not functioning as intended. 2014-09-30 13:24:00 -07: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
Ben Spiers
417b072c66 Hopefully stop corruption hitting gas tanks. 2014-09-30 20:24:04 +01:00
Ben Spiers
e7f3204ed7 Fix a tesseract fluid issue. 2014-09-30 20:24:04 +01:00
Aidan C. Brady
c01212aae1 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/generators/common/MekanismGenerators.java
 2014-09-27 15:23:31 -04:00
Aidan C. Brady
94108d3e37 Made MekGen recipes more OreDict friendly 2014-09-27 15:19:53 -04:00
Aidan C. Brady
9eb9eab91d Added in a fun little silk touch multiplier config 2014-09-27 15:07:55 -04:00
Aidan C. Brady
521f7d7853 Cleanup 2014-09-27 14:44:13 -04:00
Aidan C. Brady
9bf4baab49 Merge branch 'development' into 1.8 (hopefully I didn't miss anything) 
Conflicts:
	src/main/java/mekanism/client/gui/GuiGasTank.java
	src/main/java/mekanism/client/gui/GuiPortableTeleporter.java
	src/main/java/mekanism/client/gui/GuiTeleporter.java
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/content/transporter/TransporterStack.java
 2014-09-27 14:40:25 -04:00
Aidan C. Brady
cde5755ee3 Fixed an import 2014-09-27 14:09:13 -04:00
jmongeon
5011ea1c70 Add comparator support to the GasTank (#1829). 2014-09-26 20:35:43 -04:00
Ben Spiers
d31ebf88eb Hopefully fix the Gas Generator issue for good. 2014-09-24 21:53:25 +01:00
Ben Spiers
63101ade28 Merge pull request #1854 from pwestling/add_salination_speed_config 
add config for salination plant water transformation per update
 2014-09-24 19:22:21 +01:00
Ben Spiers
68f6348c31 Merge pull request #1853 from pwestling/add_dump_excess_to_gas_tank 
add "dump excess" option to gas tank
 2014-09-24 18:26:48 +01:00
Ben Spiers
0c5fa1bd16 Merge pull request #1852 from pwestling/add_decrement_teleporter_digit 
add right click decrement functionality to teleporter digits
 2014-09-24 18:25:58 +01:00
Ben Spiers
212ae4d429 Merge pull request #1850 from pwestling/fix_transporter_respect_nbt_in_dest_inventory 
compare stack tags as well as item id
 2014-09-24 18:25:35 +01:00
Porter Westling
986e0ac1b4 add config for salination plant water transformation per update 2014-09-24 09:31:47 -07:00
Porter Westling
2cc1b96c38 add "dump excess" option to gas tank 2014-09-23 17:15:41 -07:00
Porter Westling
bb12d91f50 add right click decrement functionality to teleporter digits 2014-09-23 12:06:17 -07:00
Porter Westling
93f5c8a797 compare stack tags as well as item id 2014-09-22 15:05:16 -07:00
Porter Westling
f284886d5c read and write entire item stack using PacketHandler in TransporterStack 2014-09-22 15:02:56 -07:00
Ben Spiers
436bb7ad86 Fix PRC GUI 2014-09-16 16:22:01 +01:00
Ben Spiers
71f6d4b8d3 Make laser digging require constant illumination. 2014-09-16 02:47:54 +01:00
Ben Spiers
c12c54f9bf Make the Laser Amplifier actually satisfactorily functional. 
Redstone controls, minimum and maximum energy thresholds, and time delays all work concurrently, removing the need for distinct modes.
 2014-09-16 02:47:54 +01:00
Ben Spiers
e84f176583 Add pulse mode to redstone control. 
(I am going somewhere with this)
 2014-09-16 02:47:54 +01:00
Aidan C. Brady
999e2de8e6 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/client/gui/GuiPRC.java
 2014-09-15 12:19:40 -04:00
Aidan
b4d3e59fa5 Merge pull request #1821 from jmongeon/GuiFixes 
A few GUI fixes
 2014-09-15 12:18:11 -04:00
Ben Spiers
4ada1ff8b7 Small laser refinements: 
* Allow slightly larger render size.
* Stop breaking blocks *just* at the end of the laser.
* Reduce default range to 64 blocks.
 2014-09-15 03:49:47 +01:00
Ben Spiers
944e288f89 Move block breaking function into LaserManager. 2014-09-15 03:47:59 +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
90f2086990 Oops. 2014-09-14 23:04:09 +01:00
Ben Spiers
f7f5e77e8e Remove a couple of unused imports 2014-09-14 23:00:55 +01:00
Ben Spiers
7fd5a28d61 Lasers can dig blocks now. 
They have a tendency to set the items they drop on fire, might make a
digging-specific variant later.
 2014-09-14 22:57:59 +01:00
Ben Spiers
355209d2e3 Fix laser hardness crash 2014-09-14 22:44:45 +01:00
Ben Spiers
b29f2adc4d LASERS 2014-09-14 05:20:16 +01:00
Ben Spiers
1cfaec3692 Fix imports, key handler. 2014-09-14 05:18:35 +01:00
Ben Spiers
1ad8f62627 Merge branch 'development' into 1.8 
Conflicts:
	build.properties
	src/main/java/mekanism/client/MekanismKeyHandler.java
	src/main/java/mekanism/common/FluidNetwork.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/item/ItemBlockEnergyCube.java
	src/main/java/mekanism/common/item/ItemBlockGasTank.java
	src/main/java/mekanism/common/item/ItemBlockMachine.java
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
	src/main/java/mekanism/common/multipart/PartSidedPipe.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/tools/common/MekanismTools.java
 2014-09-14 01:36:11 +01:00
Ben Spiers
5fefe0068f Fix saving of Gas Generator Gas Tanks. 2014-09-13 23:22:15 +01:00
jmongeon
b1105fb0b0 Add energy info widget to Pressurized Reaction Chamber. 2014-09-12 04:50:49 -04:00
jmongeon
6b456fba9a Add missing energy gauge tooltip to Chemical Infuser and Chemical Oxidizer. 2014-09-12 04:38:11 -04:00
jmongeon
fb9ec04ef0 Add missing energy info tab Rotary Condensentrator Gui. 2014-09-12 02:31:34 -04:00
Ben Spiers
372705a448 Make energy upgrades affect fuel usage 2014-09-12 02:06:40 +01:00
Aidan C. Brady
c512d72b06 Increased Gas Tank's output by a factor of 16 - it now can emit 256 units of gas per tick. This should help counter the secondary energy changes. 2014-09-12 01:54:14 +01:00
Ben Spiers
83d9ecaf23 Mouse button binding fixed 
Also, make the extra info in tooltips use the sneak keybind.
 2014-09-11 04:05:45 +01:00
Ben Spiers
2326048750 Merge branch 'development' 2014-09-07 00:27:45 +01:00
Ben Spiers
c178f471f4 Cherry pick: Fix not sending tile updates 
Conflicts:
	src/main/java/mekanism/common/multipart/PartSidedPipe.java
 2014-09-07 00:26:03 +01:00
Ben Spiers
32b3a5b0ac Fix some potential NPE problems. 2014-09-07 00:15:23 +01:00
Ben Spiers
bafdb18756 Fix Gas Tanks filling from the wrong type of gas. 
(eg. in a Chemical Injection Chamber.)
 2014-09-07 00:15:00 +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
3160ec0691 Cleanup imports again. 2014-09-05 18:32:54 +01: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
29c94f9dd8 Use package-info files and @API annotations. 2014-09-05 04:22:36 +01:00
Ben Spiers
573b60de04 Turns out the itemid can change on world load. 
Use the unlocalised name instead as this should be constant. Anyone using the stack size in the unlocalized name method should be shot.
 2014-09-05 04:22:04 +01:00
Ben Spiers
c7a429177b More work in the quest for greater recipe efficiency. 2014-09-05 04:20:12 +01:00
Ben Spiers
c6a77f9cfa Fix handling of Wildcarded recipes. 
Disadvantage of the new system is it does require checking exactly the metadata on ItemStacks that is in the recipe.
 2014-09-04 04:28:44 +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
4dd3d4ba01 I think this will prevent a potential memory leak. 2014-09-03 19:49:47 +01:00
Ben Spiers
cb1a40a137 Try and fix the mouse binding issue. 2014-09-03 19:25:29 +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
a01cf948ff Add recipe and ItemBlock to plastic barriers. 2014-09-02 20:29:09 +01:00
Ben Spiers
215cebb143 Remove unused internal class 2014-09-02 18:44:31 +01:00
Ben Spiers
8f6b0ce6de Fix Portable tank fluid setting bug 2014-09-02 18:44:31 +01:00
Ben Spiers
c21404dd2d Make the tank-type renderers reset their DisplayLists on texture reload. 
This will prevent missing-texture/wrong-texture weirdness when changing texturepacks in-world. Also noticed that two old render classes from my first rewrite of transmitter rendering are now unused, so deleted them.
 2014-09-02 18:44:31 +01:00
Aidan C. Brady
99a5702de9 Cleanup - this renderer is so pretty 2014-09-02 08:08:03 -04:00
Ben Spiers
70ef6fb873 Make the Plastic Barrier coloured. 
Still no recipe, but I'm sure we'll get to that at some point.
 2014-09-02 03:22:02 +01:00
Ben Spiers
4ea93a6fa1 Add Connected textures to the opaque reactor blocks. 
They're not very good at the moment, but they look ok.
 2014-09-01 23:22:27 +01:00
Ben Spiers
7aa2617a96 Continue the attempting to be killing the bug with the fire... 2014-09-01 20:17:55 +01:00
Ben Spiers
33de5d3967 Merge branch 'experimentalCTM' into 1.8 2014-09-01 20:05:22 +01:00
Ben Spiers
6d0f8096f0 Add in support for rendering sides with overriden textures. 
Also special facing support. Salination Plants now fully connected - the Controller texture could do with some cleaning up to improve the connected look.
 2014-09-01 20:04:00 +01:00
Ben Spiers
b1a11b0ba2 Further adapt the multiblock code. 
This will allow inter-block connected textures. I'll try and get side-specific texture overrides (eg. for the Salination Controller) working next.
 2014-09-01 18:19:21 +01:00
Ben Spiers
0be5320143 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/util/MekanismUtils.java
 2014-09-01 04:10:53 +01:00
Ben Spiers
26cf0ee925 Merge branch 'master' into development 2014-09-01 04:06:47 +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
6ffb64b740 KILL #1759 THE IMPOSSIBLE BUG KILL KILL 2014-08-31 20:30:41 +01:00
Aidan C. Brady
9224d1278a Cleanup. Great work on the sound system overhaul, @unpairedbracket! It's perfect! 2014-08-31 02:01:11 -04:00
Aidan C. Brady
ee379d7108 Added crush/enrich recipes for Fluix Dust and Crystals 2014-08-31 01:34:53 -04:00
Aidan C. Brady
98ca2315e2 Increased Gas Tank's output by a factor of 16 - it now can emit 256 units of gas per tick. This should help counter the secondary energy changes. 2014-08-30 19:29:29 -04:00
Ben Spiers
3462126f3b Oops. Missed a loop with direct emission to BC. 2014-08-30 03:55:46 +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
1ba5665e07 Fix indent. 2014-08-30 02:54:19 +01:00
Ben Spiers
779759ac1e Make the sound config options apply again. 2014-08-30 02:37:02 +01:00
Ben Spiers
05c7e63c55 Make shift not required to see contents of Portable Tanks. 
For convenience of NEI searching.
 2014-08-30 02:36:10 +01:00
Ben Spiers
0d77240289 Add lang utility methods to localise FluidStacks, use them throughout the codebase. 2014-08-30 02:34:50 +01:00
Ben Spiers
1215b50e06 Fix config option. 2014-08-30 01:53:29 +01:00
Ben Spiers
94ca605b48 Remove some deprecation. 2014-08-30 01:51:53 +01:00
Ben Spiers
2a52ba36af Make SoundHandler static, remove some unneeded stuff. 2014-08-30 01:51:42 +01:00
Ben Spiers
c4d1fd32f4 Found a way to reduce the nasty sound delay when rapidly toggling sounds on and off. 2014-08-30 01:08:55 +01:00
Ben Spiers
3a0d0d2208 Make the fade-in times match the old Mek sound system, give some things a fade-out of 0.5s because it sounds nice that way. 2014-08-30 01:08:05 +01:00
Ben Spiers
e83f3ee042 Merge branch 'soundsystem' into 1.8 
@aidancbrady, I got this working, might need some more refinement but
it's pretty stable
 2014-08-30 00:11:14 +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
c71c5d9fe7 Fix integer conversion 2014-08-29 03:14:00 +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
e3fc694532 Fix Gas Generator item gas tank restoration. 2014-08-28 20:00:56 +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
e0fc1194e1 Revert "Fix I goofed." 
This reverts commit 39509fc133.
 2014-08-28 03:29:42 +01:00
Ben Spiers
52b52e1c2e Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java
 2014-08-28 03:29:11 +01:00
Ben Spiers
39509fc133 Fix I goofed. 2014-08-28 03:13:11 +01:00
Ben Spiers
dd3ae67750 Fix some pretty severe plenisher problems that must have gone a while relatively unnoticed. 2014-08-28 03:12:58 +01:00
Ben Spiers
be3120800f First attempt at jetpack sounds under vanilla system. Bad. 2014-08-28 02:10:09 +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
41be14fad4 Start to re-implement sound system in vanilla sounds. 
This will make us compatible with XU mufflers (when they're) fixed and
reduce unneccesary reinvention of wheels.
 2014-08-27 20:15:33 +01:00