MachineMuse / MachineMusePowersuits

Minecraft mod, take 2
236 stars 105 forks source link

Merge in MPS-addons #586

Closed MachineMuse closed 8 years ago

MachineMuse commented 9 years ago

I would like to improve the localization and configuration options first but this is on the agenda.

Xen1290 commented 9 years ago

I've made a list of possible addons, to help you and collect some addons suggestions, take a look and don't panic, MPSA for 1.7.10 (QMX or not) has 95% of this done! @MachineMuse

Components to add

Those are from here: (removed useless module, torch placer) http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1290570-1-5-2-modular-powersuits-addons-mpsa-requires (updated version: http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1293401-modular-powersuits-addons-mpsa-requires-modular)

Maybe new addons: (QMX Forks or 1.7.10 port)

Pinkbyte commented 9 years ago

I like this idea. I also have one module, that i have not sent pull request on - scoop from Forestry. A someway ready to use code can be found at my little fork, branch forestry-scoop - https://github.com/Pinkbyte/MachineMusePowersuits/commit/cf0f2d091371d1cc2ea284b2056110d863f223df

It's one commit actually and, as Forestry fixes from my fork was already merged upstream, it's not very hard to implement this module. Not sure about the balance(e.g. price of installing of the module), though.

@MachineMuse, your thoughts?

Xen1290 commented 9 years ago

+1 For scoop module ! Very useful.

MachineMuse commented 9 years ago

Looks fine Pinkbyte. Want to patch it a bit with the way I changed the localization and send a pull request?

Pinkbyte commented 9 years ago

Okay, see https://github.com/MachineMuse/MachineMusePowersuits/pull/622

lehjr commented 9 years ago

For me, merging the addons seems to be easier than getting MPS to run in a dev environment. I expected things like having to disable one of the chisel mods, having to delete the outdated Buildcraft API in Railcraft, or having to add the CoFH access transformers, even the Intellij 1.4 bug (not loading resources), I just didn't expect to have to decompile, fix and recompile Smart Render because of a bug: if(minecraft.theWorld != null && minecraft.theWorld.isClient)

Luckily, Galacticraft has enough of the code in their mod so that cleaning up the decompiled code wasn't necessary. Anyway, this is my progress so far (it's not pretty but it has working things like AE2 and EC2 wireless terminals): https://github.com/lehjr/MachineMusePowersuits/tree/quick-n-dirty-mpsa-merge

Please note that it should not be taken as a serious effort, and normally I wouldn't display such a mess, but I thought it might be useful since the AE2 wireless terminals and a few other things are working. I also have AE2-RV3 compatible code in a fork of QMX-MPSA that I haven't added to this experiment yet.

Xen1290 commented 9 years ago

@lehjr make a pull request to experimental branch, so it's easier to show what you have done. Also I agree with you for the development evironment, i think the old chisel compatibility can go away, and maybe someone can fix the development environment? Sorry for possible english mistakes. @MachineMuse

lehjr commented 9 years ago

@Xen1290 It's nowhere near ready for a PR. It's more of a demo at the moment. Once I get more things working and clean it up a bit I'll do a proper commit. Also, as far as I can tell, both forks of chisel are actively being worked on, so it makes picking one a bit harder.

Xen1290 commented 9 years ago

@lehjr ah no problems, for chisel, as far as I can see, chisel 2 isn't updated since september, and 2/3 of chisel 2 team is now working in chisel.

lehjr commented 9 years ago

Well, pretty much done. Maybe not as good as it could be, but nearly everything works.

MachineMuse commented 8 years ago

Ok, gonna close this since it's been merged in :)