Commit Graph
129 Commits
Author SHA1 Message Date
Tom Elfring b72d6efab3 Java 7 and 8 cleanup
Diamond operator <>
Lambdas and method references
2017-08-05 17:50:38 +02:00
Tom Elfring c9dc4c0ac0 Merge remote-tracking branch 'upstream/1.11' into 1.12 2017-08-04 18:49:20 +02:00
aidancbrady d38d519238 Fixed crash 2017-08-02 20:54:17 -07:00
aidancbrady 8ed83b0e4f Merge branch '1.11' into 1.12
* 1.11:
  Fixed the horrible transmitter issue (spec: DynamicNetwork:215-218) Also, fixed client render update delay
  move zh_cn lang file back to thr correct place
  Update entity names
  Another cleanup
  Fix dev environment after adding SD compat
  Kill off some unused code
  Updated minor compat

Conflicts:
	build.gradle
2017-07-31 18:40:01 -07:00
aidancbrady 48c748e55e Kill off some unused code 2017-07-26 14:04:26 -07:00
Tom Elfring 69e163abd9 Merge remote-tracking branch 'upstream/1.11' into 1.12_firstpass 2017-07-26 19:38:35 +02:00
Tom Elfring 341e11da70 Fix config caching of pump, miner and plenisher.
Fixes 4560.
2017-07-26 10:17:00 +02:00
Tom Elfring df68b1e36a Merge remote-tracking branch 'upstream/1.11' into 1.12_firstpass 2017-07-23 13:56:41 +02:00
Aidan f590af2e04 Merge branch 'master' into master 2017-07-22 20:54:20 -07:00
Tom Elfring a13ce7910d Update mappings to 20170616 2017-06-16 20:26:39 +02:00
aidancbrady 98a0b2aa81 Fixed Digital Miner dupe bug 2017-04-28 16:59:52 -04:00
aidancbrady 21c49c1643 Advanced item handing, adding inventory-searching to basic item ejection- no longer will items get jammed
Also, fixed transmitter tooltips
2017-04-28 14:54:26 -04:00
aidancbrady 808f0cdf8a More refactoring, gave Rotary Condensentrator and Electrolytic Separator sound effects. Need to fix bugs 2017-04-27 22:51:44 -04:00
aidancbrady b3621cd511 Cap at max energy after energy upgrade removal 2017-04-27 20:53:06 -04:00
aidancbrady 61e024b8e8 Fixed Digital Miner bound issue 2017-04-27 16:34:09 -04:00
aidancbrady 2848b6fa47 Computer integration fixes 2017-04-27 13:33:55 -04:00
aidancbrady b72740cffd Add comprehensive computer integration to Logistical Sorter 2017-04-24 10:44:31 -04:00
aidancbrady b97b7184c1 Completely refactor inventory management to allow IItemHandler support. Likely many bugs to fix, but it's a start 2017-04-19 16:16:09 -04:00
Tom Elfring 704826f0fd Fix null Itemstacks in miner and recipes
Fixes #4321 and #4319
Thanks to @allanf181 for finding the recipe bug
2017-04-17 15:07:14 +02:00
aidancbrady 01e61cb2fa Fix digital miner GUI auto-closing 2017-04-13 17:11:07 -04:00
aidancbrady c9cbb405d4 More API fixes 2017-04-13 16:15:26 -04:00
aidancbrady 6eb8e59f3c Fix more ItemStack issues 2017-04-03 20:12:02 -04:00
aidancbrady 01ab160ff9 Transition from null stacks to ItemStack.EMPTY 2017-03-29 01:08:36 -04:00
Lignum 0ed369c0e4 Replace 'toRemove' pattern with Iterator.remove() calls 2017-03-28 19:25:45 +02:00
aidancbrady 6a42eb64e3 Update to 1.11.2. Untested, still using outdated MCMP 2017-03-25 20:35:26 -04:00
aidancbrady 8e1ee9a581 Chunk Loader Upgrades. They work with Digital Miners and automatically adjust to their mining radius. 2016-08-10 15:37:29 -04:00
aidancbrady 46725948f2 Helper methods for DM chunks 2016-08-09 01:28:20 -04:00
aidancbrady 4745a78ecc Fixed Digital Miner breaking 2016-07-10 11:34:00 -04:00
aidancbrady e6da7fdc9c Update to latest Forge, use Capability standards. Need to port to new fluid system 2016-06-23 16:34:27 -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 c9f8fd011e Polished capabilities, still need to decide if we're allowed to ship capability references in API 2016-05-27 14:02:15 -04: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 3983cc858b Begin the great port. 2378 errors to go! 2016-05-24 20:04:40 -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 9ec5606ec0 Better fake player reporting, thanks to @DraksterAU 2016-05-17 12:37:47 -04:00
Ben Spiers d51aa1bb44 Merge branch '1.8.9' of github.com:aidancbrady/Mekanism into 1.8.9 2016-05-12 23:58:19 +01: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
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
Ben Spiers 628c5865ca Fix crashes with null capability tiles.
Also concerns about missing capabilities.
2016-05-07 13:38:02 +01:00
Ben Spiers 384cf174bb Get capabilities off the ground 2016-05-04 12:45:12 +01:00
Ben Spiers 5825c84fad Merge branch 'development' into 1.8.9 2016-04-27 23:47:00 +01:00
Aidan 541a802228 Merge pull request #3186 from Buildstarted/dev
Peripherals api includes invalid indexes for methods with string parameters
2016-04-25 14:27:58 -04:00
Ben Dornis 7a77c4f2c0 fixed method indexes for peripherals 2016-04-25 09:58:11 -07: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
Ben Spiers 78c2afb5ea Actually get it compiling again.
Seems to run ok, I think?
2016-04-25 13:11:26 +01:00