Anvilcraft/ModularPowersuits
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
818 commits 1 branch 0 tags 5.5 MiB
Commit graph

603 commits

Author SHA1 Message Date
Andrew2448
89dd8cd1e1 Add ore dictionary support for gears in Thermex recipes. 2013-04-29 23:22:47 -04:00
MachineMuse
a75b51004b implemented new MFR wrench interface 2013-04-29 17:44:46 -06:00
MachineMuse
5b605675f1 can now change away from power tool while sneaking with number keys 2013-04-29 16:59:30 -06:00
MachineMuse
196d37e204 max energy now limits current energy 2013-04-29 12:23:46 -06:00
MachineMuse
2b367083aa added possibility to use extra mouse buttons to bind to modules 2013-04-29 12:14:29 -06:00
MachineMuse
39b435ae38 fix for infinite loop on tier 2013-04-29 12:02:26 -06:00
MachineMuse
9fb20a256c Changed to a URL-based loader to allow for jarred modelspecs 2013-04-29 11:23:25 -06:00
MachineMuse
7053cbde8b xml parsing is go! 1 hardcoded file for now...but it should give you an idea of what the format should be 2013-04-29 11:14:27 -06:00
MachineMuse
6861f7e882 Complete model system rewrite, works perfectly >:3 now just need a gui for it 2013-04-29 10:42:51 -06:00
MachineMuse
dcc57b2e7c fix for shears module dropping leaves when no energy 2013-04-29 00:22:02 -06:00
MachineMuse
a2834c3f3e more model refactoring to unify rendering 2013-04-28 15:53:11 -06:00
MachineMuse
736d93b860 added new modelformatexception for obj loader 2013-04-28 14:30:46 -06:00
MachineMuse
a979bfff53 Merge remote-tracking branch 'origin/master' 2013-04-28 14:28:05 -06:00
MachineMuse
57b66488d9 more mussing about with model loading, nothing usable yet 2013-04-28 14:27:47 -06:00
Claire
639c5bdec8 Update RecipeManager.java 2013-04-28 14:05:13 -06:00
MachineMuse
a0da0e3de1 fixed model attachment points 2013-04-28 11:52:34 -06:00
MachineMuse
39999e3d51 More scaladerps DO NOT DOWNLOAD THIS YOU IDIOTS 2013-04-28 11:06:26 -06:00
MachineMuse
2fd195fadc Refactored electricity again and made 'on fire' damage not add heat when you are already overheating 2013-04-28 05:33:10 -06:00
MachineMuse
67208f27ad made forge version dependency explicit 2013-04-28 01:15:48 -06:00
MachineMuse
3a67eb4006 another gregtech recipe fix 2013-04-28 01:11:03 -06:00
MachineMuse
fcd501e5ff made Lux Capacitors not tick 2013-04-27 21:19:08 -06:00
Claire
10c7c12575 Merge pull request #212 from Andrew2448/MFFS 
Minor tweaks on MFFS Field Teleporter and Grafter modules.
 2013-04-27 01:34:54 -07:00
MachineMuse
4864afe592 fixed some more gregtech recipes c/o rjenkins8142 2013-04-27 02:33:07 -06:00
MachineMuse
bf6c120e6d made hud elements only render when no gui is open 2013-04-27 02:33:06 -06:00
Andrew2448
44c3fd5498 Add heat generation to the grafter module to prevent excessive use. 2013-04-26 22:43:52 -04:00
Andrew2448
602177edc3 Minor tweaks on MFFS Field Teleporter module. 2013-04-26 19:29:49 -04:00
Claire
dbd14b065d Merge pull request #207 from Andrew2448/MFFS 
Added MFFSFieldTeleporter module.
 2013-04-26 00:42:35 -07:00
MachineMuse
edf1feef2f more nullchecks??!?? 2013-04-26 01:26:25 -06:00
Andrew2448
fb8af398ac Tweak MFFSFieldTeleporter and OmniWrench modules. 2013-04-25 20:20:44 -04:00
Andrew2448
b725e8f279 Add MFFSFieldTeleporter module. Thanks to Minalien for the suggestion and API. 2013-04-25 19:53:31 -04:00
MachineMuse
ac2e55eca5 recommended push 2013-04-25 14:59:19 -06:00
MachineMuse
010cca1c66 more attempts at thaum render fixes 2013-04-25 12:27:51 -06:00
MachineMuse
5dcb80da18 changed .class to .TYPE for primitives in reflection 2013-04-25 11:47:30 -06:00
MachineMuse
38897473eb reflection tweak? 2013-04-25 11:45:54 -06:00
MachineMuse
ee562d953b another render event handler fix...reflection sucks 2013-04-25 11:33:17 -06:00
MachineMuse
86af87b8ef added stacktraces to thaum render event handler ?? 2013-04-25 11:30:00 -06:00
MachineMuse
519aa8709e Thaum goggles module 2013-04-25 10:19:20 -06:00
MachineMuse
200b1b00a7 Undo ic2 reversion 2013-04-25 06:19:45 -06:00
MachineMuse
2e066bce2f backporting everything for ic2 289 -.- 2013-04-25 05:55:03 -06:00
MachineMuse
981bcbde6f another fix for omniwrench module 2013-04-25 05:36:02 -06:00
MachineMuse
03a76c5a84 ic2 recipe fix 2013-04-25 04:34:55 -06:00
MachineMuse
4047ffff92 bumped ic2 api in build script 2013-04-25 04:25:23 -06:00
MachineMuse
a5809a64fd IC2 support updated to 304 and fixed 2013-04-25 04:18:19 -06:00
MachineMuse
10b1e8bedb obfuscation fix for binoculars module 2013-04-24 19:09:10 -06:00
MachineMuse
4ab294fb51 fixed crash on thrust with no helmet 2013-04-24 18:33:47 -06:00
MachineMuse
468042ea46 multiplayer fix for binoculars 2013-04-24 18:29:42 -06:00
MachineMuse
cbd875f78c Fixed some recipes and moved some modules to better spots 2013-04-24 03:02:44 -06:00
MachineMuse
e41df5a4c6 added binoculars 2013-04-24 02:30:25 -06:00
MachineMuse
3cb80e5ec1 fixed clampdouble (texture sheet issue) 2013-04-23 23:23:08 -06:00
MachineMuse
fb3f21dc51 render fixed 2013-04-23 23:02:06 -06:00
MachineMuse
7d49898527 Various more refactorings, rendering broke 2013-04-23 22:49:00 -06:00
MachineMuse
66237c2921 added getter/setter for gem colour 2013-04-23 19:03:36 -06:00
MachineMuse
0d922d867a Electric Item Utils actually refactored this time! 2013-04-23 18:57:54 -06:00
MachineMuse
e3b331ebf3 Electric Item Utils refactored! 2013-04-23 18:36:17 -06:00
MachineMuse
bb9cbe0f45 More refactoring in the electric items area 2013-04-23 18:01:38 -06:00
MachineMuse
1fef853aea something missing...wtf 2013-04-23 17:41:40 -06:00
MachineMuse
e9b79d0a18 Refactoring electric adapters...must be a better way to do it :s 2013-04-23 17:35:59 -06:00
MachineMuse
fb93b632a1 refactoring and scalafication 2013-04-23 15:36:51 -06:00
MachineMuse
f81ad9edd4 fix lame rightclickfirst behaviour 2013-04-23 12:29:40 -06:00
MachineMuse
fec2cc6051 fixed gl underflow on fast graphics setting 2013-04-22 23:59:49 -06:00
MachineMuse
8ffc490c6b fix for ghost drops on single player from spinning blade 2013-04-22 19:40:45 -06:00
MachineMuse
569c9b27de added flying kick prevention to other vertical movement modules 2013-04-22 18:58:55 -06:00
MachineMuse
f8ddad0a6a possible fix for flying enabled issue 2013-04-22 18:48:06 -06:00
MachineMuse
a90a78de3b fixed lux capacitor entity rendering/collision 2013-04-22 01:13:24 -06:00
MachineMuse
a4dc386740 added bounding box calculations to lux capacitors and made them easier to break and drop nothing 2013-04-22 01:02:48 -06:00
MachineMuse
d68d91e0f0 Added config option to allow 'taken' keybinds 2013-04-21 23:27:45 -06:00
MachineMuse
bcd4a9f967 updated ic2 api to 289 and fix massive scaladerp with ic2 electric item interface 2013-04-21 22:01:07 -06:00
MachineMuse
00939bd92e Merge complete 2013-04-21 20:40:41 -06:00
Andrew2448
4d4b73146c Migrated Grafter and Apiarist Armor modules to MPS from MPSA. 2013-04-21 20:37:08 -06:00
Andrew2448
63ddd5b0a6 Migrated OmniWrench module from MPSA to MPS. 2013-04-21 18:29:43 -04:00
Andrew2448
a6372da8a0 Migrated Grafter and Apiarist Armor modules to MPS from MPSA. 2013-04-21 15:29:54 -04:00
MachineMuse
5ffade4e6a added more nullchecks to raytracing functions (deal with it FC) 2013-04-21 01:54:49 -06:00
MachineMuse
dd5623fa3f Refactored jets and swim boost to use unified code better and moved most static playertickhandler functions to MusePlayerUtils 2013-04-21 01:21:41 -06:00
MachineMuse
4ffe05818c added lux capacitor timeout and removed possibility of colliding with 2 faces 2013-04-21 00:50:38 -06:00
MachineMuse
8cdd184be2 converted electric item interface handling to more maintainable scala traits 2013-04-20 22:48:35 -06:00
MachineMuse
8bababe3d3 fix some utf issues 2013-04-20 01:27:02 -06:00
MachineMuse
c0e401f4da Converted logger to Scala...will this work? D: 2013-04-20 01:16:44 -06:00
MachineMuse
ac3987827e scala test 2 2013-04-19 14:02:40 -06:00
MachineMuse
f9c9ece99c testing to see if scala will compile with newer forge version! 2013-04-19 13:43:51 -06:00
MachineMuse
559eda9a5a building up recipemanager for recipe configuration and scala fails 2013-04-19 13:33:21 -06:00
MachineMuse
6cefd4c60b Updated Galacticraft API 2013-04-19 11:31:07 -06:00
MachineMuse
7adf5edb7e A couple potential fixes for the Curse of the Missing LV Capacitor 2013-04-19 11:14:51 -06:00
MachineMuse
8c67bd297b Added 'lux capacitor' lamps 2013-04-19 07:27:51 -06:00
MachineMuse
101dd97a0a HeatSink weight fix 2013-04-19 07:12:44 -06:00
MachineMuse
51c08e4476 Water=5x cooling, lava=0x. Also extinguishes fire when below max heat 2013-04-19 04:58:09 -06:00
MachineMuse
a19c4a0fc4 changed default cooling cap back to 400% 2013-04-19 04:46:34 -06:00
MachineMuse
efe66cba27 Crappy fix for inventory background tool render issue 2013-04-19 04:40:25 -06:00
MachineMuse
77c19005ad Plasma bolts obey mobgriefing 2013-04-19 04:38:11 -06:00
MachineMuse
7ab1487977 Hoe fails if lacking energy 2013-04-19 04:36:56 -06:00
MachineMuse
135f23652e Added some new icons c/o Memzak from MCF 2013-04-19 04:36:38 -06:00
MachineMuse
1081277ef7 made cooling system toggleable 2013-04-19 04:20:35 -06:00
MachineMuse
21f76f9943 Added heat sink & cooling system 2013-04-19 04:14:45 -06:00
MachineMuse
4c47152b80 Added heat emission to railgun and plasma cannon 2013-04-19 03:55:00 -06:00
MachineMuse
a607f2be33 added cost and tinker values to blade launcher 2013-04-19 03:06:25 -06:00
MachineMuse
6a1987d8fa Fixed all modules consuming energy on block break 2013-04-19 03:05:42 -06:00
MachineMuse
266f02919a removed deprecated PreloadTextures 2013-04-19 02:27:09 -06:00
MachineMuse
c876b01659 Heat system implemented, now to add it to modules 2013-04-19 02:26:59 -06:00
MachineMuse
65e9ef7928 Spinning blade changes 2013-04-19 02:26:18 -06:00
MachineMuse
5722007f2c Fixed jetpack not draining energy without flight control 2013-04-18 20:56:42 -06:00
MachineMuse
84dfcbd61b Changed electric item adapter to default to using TE interface 2013-04-18 20:56:18 -06:00
MachineMuse
837a2ad912 Tidying up some autoformat crap 2013-04-18 20:55:58 -06:00
MachineMuse
14782c4925 gave railgun a 0.5second cooldown 2013-04-18 20:23:15 -06:00
MachineMuse
71dc01b430 Fix plasma bolt animation on non-plasma module 2013-04-18 20:22:36 -06:00
MachineMuse
b181f878f7 Merge branch 'master' of https://github.com/MachineMuse/MachineMusePowersuits 2013-04-18 20:22:16 -06:00
MachineMuse
2e91b3636d fix missing texture on tinker table 2013-04-18 20:22:09 -06:00
MachineMuse
fcf4ece431 fix for z crash in menu 2013-04-18 13:18:58 -06:00
MachineMuse
bb1e84395c changed power armor back to iron material 2013-04-17 17:39:22 -06:00
MachineMuse
9a1ef43967 Fix unlocalized name for tinkertable 2013-04-16 22:50:32 -06:00
MachineMuse
1d6b1c05a6 fixed keybind screen 2013-04-15 22:57:37 -06:00
MachineMuse
e64a22b808 Preliminary graphical meters 2013-04-15 22:57:35 -06:00
Claire
90cec7a0ef Merge pull request #176 from Andrew2448/GregTechFix 
Fix for GregTech recipes.
 2013-04-14 18:34:13 -07:00
MachineMuse
d6704c8eef graphical tweaks (poses...) a bit more to go 2013-04-14 19:33:42 -06:00
Andrew2448
1ba7d29441 Fix for GregTech recipes. 2013-04-14 21:07:17 -04:00
MachineMuse
378cb2729a armor no longer prevents unblockable damage 2013-04-14 15:33:47 -06:00
MachineMuse
4ac2c50ea0 TESR texture fix 2013-04-14 15:32:36 -06:00
MachineMuse
34373d1704 Switched to stack-based render flags (should interfere with other rendering less) 2013-04-14 14:53:35 -06:00
MachineMuse
376a40c56e Custom armor models are GO 2013-04-14 01:37:48 -06:00
MachineMuse
5e622f19dc preliminary armor model work 2013-04-13 23:35:54 -06:00
MachineMuse
286a2b6869 another network fix 2013-04-13 21:03:40 -06:00
MachineMuse
1495460e2b most features now check for mps items before activating (including energy display) 2013-04-13 20:03:47 -06:00
MachineMuse
7df3f423d6 More scroll tweaks 2013-04-13 18:50:18 -06:00
MachineMuse
d67aae0537 better mousewheel scrolling ratio (1/15) 2013-04-13 18:36:35 -06:00
MachineMuse
5d150f56b0 better mousewheel behaviour 2013-04-13 18:30:20 -06:00
MachineMuse
8198961de2 Fixed up arrow vertex order & added mousewheel scrolling of module frame 2013-04-13 18:15:05 -06:00
MachineMuse
d5e6a9f6ba fix for tooltip artifacts 2013-04-13 17:46:07 -06:00
MachineMuse
6e7d9b3b48 Added arrows to scrolling frame 2013-04-13 17:30:26 -06:00
MachineMuse
f6a3709a25 Fixed auto-layout 2013-04-13 17:04:54 -06:00
Claire
672af7f551 Merge pull request #170 from Andrew2448/forestry 
Added a check to see if forestry is installed.
 2013-04-13 15:53:24 -07:00
Andrew2448
a4d6eb3422 Added a check to see if forestry is installed. 2013-04-13 17:59:14 -04:00
MachineMuse
dbff37be73 Tweaking scrollable frame behaviour 2013-04-13 15:52:06 -06:00
MachineMuse
31e0ce30c1 Added basic armor model (not working yet) and preliminary module-select scrolling system 2013-04-13 15:36:18 -06:00
MachineMuse
3bd1e4de98 updated to 651 forge and added model files to repo, support tba 2013-04-12 15:54:13 -06:00
MachineMuse
76689377e7 removed unused variables 2013-04-12 14:41:05 -06:00
Andrew2448
842dcce398 Migrated the remaining mod specific modules. 2013-04-11 21:37:31 -04:00
Andrew2448
cc6de168b3 Using a more efficient check. 2013-04-11 21:02:18 -04:00
Andrew2448
44d8169b15 Added a check in the SwimAssistModule that stops power drain when in a boat. Fixes #151 2013-04-11 20:57:06 -04:00
Andrew2448
aed9b1a128 Fix for Thermal Expansion recipes 2013-04-11 19:31:24 -04:00
MachineMuse
97149e71c2 Fix for TE recipe fail 2013-04-11 09:29:02 -06:00
MachineMuse
54872c414b initial sound tests 2013-04-10 21:54:20 -06:00
MachineMuse
e65f164e04 Fixed ThermalExpansion recipes 2013-04-10 21:54:19 -06:00
Claire
3be211782a fix gregtech iridium plate oredict entry 2013-04-09 11:16:35 -06:00
Lyneira
5ced120b82 Power tool and armor now set their unlocalized names. Fixes all the power items showing up as "Power Gauntlet" 2013-04-09 17:03:42 +02:00
MachineMuse
231c244636 Updated every API (including Forge) and added ThermalExpansion Electric Item support back in 2013-04-08 01:05:38 -06:00
Claire
ee1482f0dd Fix maybe ~ I am a goof 2013-04-07 15:41:23 -06:00
Claire
6da2f8fd07 Fix IC2 electric items crashing the game if IC2 isn't loaded 2013-04-07 15:38:59 -06:00
Lyneira
2f80830224 Power armor GUI now indicates installed modules with checkmarks. Config-disallowed modules are hidden from view unless they are installed, then they're displayed with an X, allowing them to be salvaged. 2013-04-07 22:45:46 +02:00
Lyneira
a38d0aee23 Revert "When an item is selected in the power armor GUI, it will now hide modules from view that are disallowed in the config. Disallowed modules that are still installed will still be shown so they can be salvaged." 
This reverts commit 5fd0cf50b3.
 2013-04-07 17:31:33 +02:00
Lyneira
5fd0cf50b3 When an item is selected in the power armor GUI, it will now hide modules from view that are disallowed in the config. Disallowed modules that are still installed will still be shown so they can be salvaged. 2013-04-07 14:25:54 +02:00
MachineMuse
a06b9e9ff1 Powersuit helm can now act as an oxygen mask (Galacticraft) - tanks sold separately 2013-04-02 16:40:24 -06:00
MachineMuse
deecfd4647 Added keybinds for cycling modes and config option to turn off mousewheel cycling 2013-04-02 15:52:45 -06:00
MachineMuse
3328caf840 Disabled experimental heat/energy meter render 2013-04-02 14:58:36 -06:00
MachineMuse
2d323a0b8c Made input updates only send when input differs (bandwidth-saving measure) 2013-04-02 14:58:36 -06:00
MachineMuse
904c2faef4 Changed flight control key to be configurable 2013-04-02 14:58:35 -06:00
MachineMuse
0c83cd0a14 Adjusted plasma bolt rendering a bit more 2013-04-02 14:58:34 -06:00
MachineMuse
801e1b75e3 Moved control-oriented classes to control package 2013-04-02 14:58:33 -06:00
MachineMuse
8ae4e8e10b Disabled incomplete modules (blade launcher & sonic weapon) 2013-04-02 14:58:32 -06:00
MachineMuse
c065f2d3bc Added spinning blade entity (WIP) 2013-04-01 02:01:09 -06:00
MachineMuse
ef827e37f0 Moved OGL unrotate to MuseRenderer 2013-03-30 17:55:40 -06:00
MachineMuse
7abe1f1b4a added incomplete modules to config 2013-03-30 16:29:12 -06:00
MachineMuse
170bb31baa removed unnecessary variable 2013-03-30 16:28:31 -06:00
MachineMuse
83ca84b729 fixed a weird thing in jetpack/boots 2013-03-30 16:28:13 -06:00
MachineMuse
d35b7451ff preliminary work on new modules, WIP 2013-03-30 16:27:02 -06:00
MachineMuse
7175b1bf60 tinkering with plasma to make it look nicer 2013-03-28 02:54:21 -06:00
Andrew2448
761c08ca73 Migrated the last of the Config.java modules \o/ 2013-03-27 21:54:36 -04:00
Andrew2448
a93483aa87 Migrated more modules 2013-03-27 21:36:32 -04:00
Claire
d8c73355c3 Merge pull request #134 from nallar/master 
Performance improvements, simplifications and bug fixes.
 2013-03-24 19:20:18 -07:00
MachineMuse
aead813d11 Tentative 1.5.1 IC2 support 2013-03-24 20:06:23 -06:00
Ross Allan
a7d521948d Performance improvements, simplifications and bug fixes. 
Signed-off-by: Ross Allan <rallanpcl@gmail.com>
 2013-03-24 18:52:53 +00:00
MachineMuse
6d143ada1e better treecap-style search 2013-03-24 08:21:04 -06:00
MachineMuse
f33fcbbf76 added treecapitator-like functionality to axe module 2013-03-24 07:41:40 -06:00
MachineMuse
ecba6df236 added aoe capability to rototiller 2013-03-24 07:27:39 -06:00
MachineMuse
fecac008c6 added hoe module and tweaked recipes 2013-03-24 07:15:36 -06:00
MachineMuse
0a80f2bc88 Flight control module tweaks: verticality (creative mode aspect), sneaking (slow aerial movement), top speed config option (in m/s) 2013-03-24 06:58:22 -06:00
MachineMuse
1df8685249 Reordered categories 2013-03-24 05:27:27 -06:00
MachineMuse
7089e09e1b more testing and fixes with shears 2013-03-24 05:12:30 -06:00
MachineMuse
190a41be3f Added shears module and changed onBlockDestroyed to take a player argument 2013-03-24 04:55:04 -06:00
MachineMuse
ba428ce748 Organized modules by category, migrated blockbreak modules 2013-03-24 04:19:04 -06:00
MachineMuse
a8110b4e2e Added blockbreaking module interface and migrated some related modules 2013-03-24 01:58:05 -06:00
MachineMuse
803d142dac a couple more files affected by the rename 2013-03-24 01:18:28 -06:00
MachineMuse
193e81fca1 removed more enums from config 2013-03-24 01:18:05 -06:00
MachineMuse
15ee9111e5 Renamed items to be more in line with Vanilla naming and removed dependence on immutable enums 2013-03-24 01:17:21 -06:00
MachineMuse
04a0ebd998 merged more right click functions 2013-03-24 00:37:28 -06:00
Andrew2448
3a6f79a67d Merged IOnItemUseModule and IRightClickModule 2013-03-23 12:45:42 -04:00
Andrew2448
65d472cd65 Added code that should cause IOnItemUseModule modules to be selectable on the wheel for the power tool. 2013-03-22 23:07:48 -04:00
Andrew2448
0882afec4e Added onItemUse module interface. 2013-03-22 22:29:31 -04:00
MachineMuse
53faa36be3 changed movement manager to use player username strings instead of player objects 2013-03-22 16:16:03 -06:00
Andrew2448
eababd39c5 Removed some stuff moved to MPSA 2013-03-21 22:16:39 -04:00
MachineMuse
0f7811aece tidied up overlay render a little 2013-03-21 01:30:32 -06:00
MachineMuse
ebfc355c27 alternative texture sheets for modules 2013-03-21 01:30:11 -06:00
MachineMuse
744ff72190 changed tinker table inventory empty message 2013-03-21 00:11:36 -06:00
MachineMuse
6e670ca232 fixed possible crash case with raytracing 2013-03-21 00:11:35 -06:00
MachineMuse
9abeb0061d moved module triggers into a separate package and added multimeter module + rightclickfirst trigger 2013-03-21 00:11:34 -06:00
MachineMuse
51461e1132 removed java 1.7 syntax 2013-03-20 02:51:07 -06:00
MachineMuse
7c97241958 energy migrated (UE only) 2013-03-20 02:43:05 -06:00
MachineMuse
9e0e130d08 icons migrated 2013-03-20 01:06:29 -06:00
MachineMuse
80b5d8be98 Added reflection way of registering MuseIcons...probably not ideal 2013-03-19 22:31:51 -06:00
MachineMuse
b5702d2227 Some tidying up in muserenderer 2013-03-17 21:30:56 -06:00
Andrew2448
16a0f611b2 Removed recipes and components that are now a part of MPSA 2013-03-17 14:03:42 -04:00
MachineMuse
3888397a52 Updated to latest mcp names 2013-03-16 22:20:43 -06:00
MachineMuse
524fccc53c reorganized imports and messed with tick handler 2013-03-16 18:32:42 -06:00