Commit Graph
41 Commits
Author SHA1 Message Date
aidancbrady 3983cc858b Begin the great port. 2378 errors to go! 2016-05-24 20:04:40 -04:00
aidancbrady b3b714cd36 Gas Tank and Fluid Tank state management & renders, along with tier colors. I'm getting the hang of this! 2016-05-05 15:25:09 -04:00
Ben Spiers 5825c84fad Merge branch 'development' into 1.8.9 2016-04-27 23:47:00 +01:00
Ben Spiers 79d7d8b024 Fix up some more models, register StateMappers using the right function at the right time. 2016-04-27 23:40:23 +01:00
aidancbrady c2aa94d633 Player-relative block hardness for security-configured machines 2016-04-25 23:02:50 -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 9d50b8773b More fixes 2016-04-21 23:46:47 -04:00
aidancbrady 5c495de348 Fixed block placement checks 2016-04-21 23:36:02 -04:00
aidancbrady 5ed86f3f01 Extend security to generators, gas tanks and energy cubes 2016-03-21 23:14:38 -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 3c1496740c Tiered Gas Tanks and tiered Fluid Tanks! 2016-02-24 17:01:43 -05:00
Ben Spiers 0179ea1f38 Mostly rendering improvements 2016-02-01 23:42:30 +00:00
Ben Spiers 25d0b7441b Merge branch 'v9' into 1.8.9
Forgot to complete the merge so some weird stuff might have ended up in the patch. Oops.
2016-02-01 23:40:35 +00:00
aidancbrady 345feedf70 Remove ItemAttacher 2016-01-30 08:19:58 -07:00
Ben Spiers 18a1dedf92 Fix all the non-horrible blocks.
Down to 851 errors with package exclusions.
2016-01-25 16:44: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
Ben Spiers 9b8d9d92d6 Start update to 1.8.9
Fix all references to cpw.mods.fml namespace
2016-01-14 19:22:48 +00:00
aidancbrady 0b984148b4 Fixed blocks not being harvested by items with one damage level 2016-01-11 21:00:32 -05:00
Halvor Lyche Strandvoll 037e1e553f Update getPickBlock() to use the new non-deprecated version. 2015-07-08 12:34:02 +02:00
Ben Spiers 4590a71759 Make the checking of instances of other mods' interfaces safer.
Fixes (part of) #2316
2015-03-23 01:11:45 +00:00
Aidan C. Brady 9a2d47ad4b Default icons for all Mekanism blocks - fixes particle issues 2015-03-22 00:47:59 -05: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
jmongeon 5011ea1c70 Add comparator support to the GasTank (#1829). 2014-09-26 20:35:43 -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
Ben Spiers a8d04828ea Clean up some stuff using ForgeDirection's rotation matrix. 2014-08-30 03:55:46 +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 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 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
Aidan Brady 1d6de974d3 A bit of package reorganization, added InventoryNetwork to transporters 2014-08-09 22:20:49 -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
Ben Spiers 799f49d9b6 Move to Forge block rotation implementation.
Hopefully the configurator should rotate more stuff now and more wrenches should be able to rotate our blocks
2014-08-07 17:17:22 +01:00
Ben Spiers fad0da2c15 Fix a deprecated method 2014-08-04 01:09:44 +01: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
Ben Spiers 611d4c8f52 Got some IC2 stuff working now. Turns out I was being stupid. 2014-06-26 18:18:18 +01:00
Ben Spiers 9c58ed549f Start of work on Doing It Right™. Appears to work for cofh's API, not yet for IC2 or BC. Not sure why. Might have to ask @cpw. 2014-06-26 01:10:53 +01:00
Aidan C. Brady 4446e14ba3 Sound system work 2014-06-02 23:57:40 +02:00
Ben Spiers 31938e8b68 Under 1300 errors left now, started on packet/network stuffs. 2014-04-20 21:15:44 +01:00
Ben Spiers db7121454a Re-add an updated ic2, alter CC and update DepLoader. Fix more of the things.
1792 errors. A good night's work, I think.
2014-04-20 04:34:19 +01:00
Ben Spiers ab47724473 Move the directory structure around to a more conventional one and start out on the 1.7 update.
3797 errors. We have a long way to go.
2014-04-20 03:44:06 +01:00