Commit Graph
61 Commits
Author SHA1 Message Date
aidancbrady a5f4457677 Merge branch 'development' into 1.9.4
* development:
  Update pt_BR.lang
  Allow shift-right clicking machines with upgrades
  Fixed NBT reference losses
  Fixed Thermal Evaporation Controller computer integration
  Add config option for transmitter alloy upgrades
  Fixed transmitter crash, fixed entangloporter frequency issue, fixed PRC muffling upgrades

Conflicts:
	src/main/java/mekanism/client/render/RenderPartTransmitter.java
	src/main/java/mekanism/common/FluidNetwork.java
	src/main/java/mekanism/common/item/ItemAlloy.java
	src/main/java/mekanism/common/item/ItemUpgrade.java
	src/main/java/mekanism/common/util/PipeUtils.java
2016-06-15 20:41:32 -04:00
aidancbrady e18570b679 Fixed transmitter crash, fixed entangloporter frequency issue, fixed PRC muffling upgrades 2016-06-10 11:11:41 -04:00
aidancbrady fa24e0e780 Isolate MDK, update build script. Gonna try to get this pushing to the dev server 2016-05-28 19:14:18 -07:00
aidancbrady a89b8f666c <200 errors. All I have left is a bit of rendering work and the new "off hand" stuff 2016-05-25 17:30:22 -04:00
aidancbrady af008b9395 <1000 errors 2016-05-24 23:35:37 -04:00
aidancbrady 273e89a3b2 Get gas API completely working with capabilities 2016-05-23 13:45:17 -04:00
aidancbrady b618263e69 Remove deprecated IGasHandler methods, properly implement AlloyInteraction and GasHandler capabilities 2016-05-23 12:44:05 -04:00
aidancbrady be863a4289 Add Mekanism Shaped and Mekanism Shapeless recipe handlers, use ItemDataUtils to consolidate non-subtype-based NBT data into a single compound 2016-05-19 18:48:59 -04:00
aidancbrady c002ac6d8a Glow Panels render in item form, use getEffectiveSide() instead of isRemote when checking packet security 2016-05-18 19:06:36 -04:00
aidancbrady 20bd989687 Merge branch 'development' into 1.8.9
* development:
  Fixed packet security
  Fixed 'other dust' registration
  Better fake player reporting, thanks to @DraksterAU

Conflicts:
	src/main/java/mekanism/common/item/ItemOtherDust.java
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
	src/main/java/mekanism/common/tile/TileEntityBasicBlock.java
	src/main/java/mekanism/common/tile/TileEntityBasicMachine.java
	src/main/java/mekanism/common/tile/TileEntityBin.java
	src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java
	src/main/java/mekanism/common/tile/TileEntityBoundingBlock.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/TileEntityDynamicTank.java
	src/main/java/mekanism/common/tile/TileEntityElectricPump.java
	src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java
	src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
	src/main/java/mekanism/common/tile/TileEntityFactory.java
	src/main/java/mekanism/common/tile/TileEntityFluidTank.java
	src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java
	src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java
	src/main/java/mekanism/common/tile/TileEntityGasTank.java
	src/main/java/mekanism/common/tile/TileEntityInductionCell.java
	src/main/java/mekanism/common/tile/TileEntityInductionPort.java
	src/main/java/mekanism/common/tile/TileEntityInductionProvider.java
	src/main/java/mekanism/common/tile/TileEntityLaser.java
	src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java
	src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java
	src/main/java/mekanism/common/tile/TileEntityMultiblock.java
	src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java
	src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java
	src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java
	src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java
	src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java
	src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
	src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java
	src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java
2016-05-17 14:23:57 -04:00
aidancbrady 7ae60615e2 Fixed packet security 2016-05-17 13:49:55 -04:00
aidancbrady 374cc57515 Use new GlStateManager methods, got armor models to render (though the transformations seriously need to be updated) 2016-05-10 22:24:37 -04:00
Ben Spiers 84336ec4d1 Merge branch 'development' into 1.8.9
Huge merge with 202 conflicts, hopefully not *too* broken.
2016-03-18 04:24:19 +00:00
aidancbrady 87438dcc7f Boiler work, added heat info tab, worked on polishing heat interactions among machines 2016-02-27 13:32:48 -05:00
aidancbrady 9b9ed0a4c0 Polished resistive heaters, fixed a small bug in the sound system (a bit uncleanly) 2016-02-27 01:27:26 -05:00
Ben Spiers 7b4fefeb60 Fix some of the things that were broken, add more type-specs. 2016-02-08 22:46:06 +00:00
Ben Spiers 62e7cc8f65 Merge branch 'v9' into 1.8.9 2016-01-30 00:47:54 +00:00
aidancbrady a22b33a629 Energy Cubes and Gas Tanks now have configurable item inputs and gas/energy outputs, fixed Portable Tank item output 2016-01-29 00:34:50 -05:00
Ben Spiers dd99f582af State & Render stuffs, get the MInfuser rendering again.
Still no textures. WIP.
2016-01-27 01:36:39 +00:00
Ben Spiers a27c9b6839 tile package done, except for TEDigitalMiner 2016-01-25 04:36:00 +00:00
Ben Spiers dedc84605f getInventoryName() -> getName() 2016-01-23 14:24:42 +00:00
Ben Spiers 4ef5840ff9 stackTagCompound -> getTagCompound() 2016-01-23 14:15:58 +00:00
Ben Spiers a80f724cc2 Apply various common one-to-one replacements
More work on common too. network package now done.
2016-01-23 13:24:51 +00:00
aidancbrady a94c13edc7 Implement new computer framework in primary machines 2015-07-20 11:09:44 -07:00
aidancbrady 9ffc1bdff3 Localization fixes, part 1 2015-05-10 19:04:42 -04:00
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
Ben Spiers 0064f09d8c Backwards-compatibility for IGasHandler. #2267 2015-03-22 14:36:21 +00:00
Aidan C. Brady 3b96fe4a4c Fixed Digital Miner, fixed energy upgrades not affecting usage of Chemical Washers/Electrolytic Separators/Chemical Infusers/Rotary Condensentrators, added "dump excess" to electrolytic separator 2015-03-19 17:22:31 -04:00
Aidan C. Brady bfbddd3c47 Standardize the names of machine outputs 2015-03-17 10:29:09 -04:00
Aidan C. Brady 93df96851a Added remaining framework for gas/fluid tank handling, finished new configuration implementation for PRC and Chemical Injection Chamber 2015-03-08 18:24:21 -05:00
Aidan C. Brady 8ce105d95f More configuration work 2015-03-08 13:27:34 -05: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 6d291c8bbc Fixed PRC energy usage 2015-03-05 09:07:40 -05:00
Aidan C. Brady 1237230637 Fixed PRC varying reaction time not being applied 2015-03-05 08:53:01 -05:00
Aidan C. Brady c39e3d1c1f More dropper work 2015-02-26 20:50:02 -05: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 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 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 da6cbeb46d More big sound work 2014-08-27 23:16:59 +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
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 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 25cf5236ea A few fixes 2014-07-21 21:33:43 -04:00