Commit Graph
60 Commits
Author SHA1 Message Date
aidancbrady af008b9395 <1000 errors 2016-05-24 23:35:37 -04:00
aidancbrady 3983cc858b Begin the great port. 2378 errors to go! 2016-05-24 20:04:40 -04:00
aidancbrady 87910ba233 Fixed up some capability stuff 2016-05-23 00:38:04 -04:00
aidancbrady c8f3fcaee1 Merge branch 'development' into 1.8.9
* development:
  Fixed Energy Cube output, fixed multiblock max size, fixed Electric Pump heavy water pumping
  Fixed Security Desk not invalidating

Conflicts:
	src/main/java/mekanism/common/block/BlockBasic.java
	src/main/java/mekanism/common/multiblock/UpdateProtocol.java
2016-05-22 18:42:56 -04:00
aidancbrady 1e0d04ab2b Fixed Energy Cube output, fixed multiblock max size, fixed Electric Pump heavy water pumping 2016-05-22 17:58:25 -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 571a14be17 Fixed continuous block updates, fixed Heavy Water texture 2016-05-18 11:19:00 -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 ddfe83c495 Of course, the issue isn't on Minecraft's end, it has to do with Coord4D hashing. Coord4D no longer extends BlockPos to prevent hash issues 2016-05-09 21:07:18 -04:00
aidancbrady 3b75d9ff1e Loads of work on CTM, work on fixing multi blocks 2016-05-09 00:10:54 -04:00
Ben Spiers 8064beb0fc Fix compile errors from merge 2016-04-25 17:47:54 +01:00
Ben Spiers 0cb18773aa Merge branch 'development' into 1.8.9 2016-04-25 16:08:06 +01:00
aidancbrady ac16acb59a Fixed pumps not outputting 2016-03-22 20:37:16 -04:00
aidancbrady a18da2ad27 Integrate security into more machines 2016-03-21 18:25:27 -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 d332ad49b7 More consolidated fluid container management- I've been meaning to get to this for a long time 2016-03-06 02:15:56 -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 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
Ben Spiers a27c9b6839 tile package done, except for TEDigitalMiner 2016-01-25 04:36:00 +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
Ben Spiers 4247ba136a Fix compile errors in API package 2016-01-16 14:35:01 +00:00
aidancbrady faf63dfebc Updated readme, improved Electric Pump calculation 2016-01-08 00:40:37 -05:00
aidancbrady a4ab830e79 Cleanup, added Redstone Logic Adapter OC support 2015-11-27 22:04:39 -07:00
Ben Spiers c9f51bd970 Update some MekanismUtils functions to use Coord4D 2015-07-28 04:58:04 +01:00
aidancbrady c7fe1f86eb Cleaner CC support with a separate peripheral handler 2015-07-20 12:28:18 -07:00
aidancbrady ee709cc202 New computer integration for the rest of Mekanism machinery 2015-07-20 11:43:49 -07:00
aidancbrady 7799afed53 Go ahead and bump Forge to latest recommended, 1291 is looking too old 2015-07-14 14:22:27 -07:00
tterrag1098 b70c0e015f Remove hard dep on unnecessarily new forge version 2015-05-13 17:18:21 -04:00
aidancbrady 9ffc1bdff3 Localization fixes, part 1 2015-05-10 19:04:42 -04:00
Ben Spiers e6ee804686 Update forge again. 2015-04-17 18:27:41 +01:00
Aidan C. Brady 542b995b3b Electric Pump and Fluidic Plenisher now have CC support for resetting their calculations 2015-03-28 17:27:43 -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 9260414177 Finished implementing Induction Matrix core functionality, just about everything works! Need to redesign GUI to include separate gauge for output rate 2015-03-03 18:18:32 -05:00
Aidan C. Brady c39e3d1c1f More dropper work 2015-02-26 20:50:02 -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 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 e14501f3b5 Add RedstoneControl to Electric Pump. 2014-12-15 17:28:57 +00:00
Ben Spiers 5b4f154040 Giant optimise imports. 2014-11-10 21:53:29 +00: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
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 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 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 08914da371 Fixed Electric Pump lag - was able to completely eliminate system of node cleaning while boosting performance immensely 2014-08-06 13:44:59 -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 7e525e10c6 Fixed a few recipes, also started work on Digital Miner visual 2014-07-20 23:29:35 -04:00
Aidan C. Brady 1f9782d1c7 Added logic to allow fluid-accepting machines to use IFluidContainerItem fluids 2014-07-10 16:24:55 -04:00